diff options
1133 files changed, 40173 insertions, 28949 deletions
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java index 8ad7691dbc6..8ea7ab8553d 100644 --- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java +++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java @@ -1,492 +1,498 @@ -/*****************************************************************************
- * 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:
- * Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode;
-import org.eclipse.papyrus.dsml.validation.generator.xtend.Generate;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule;
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
-import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-/**
- * This is the main class that generates the EMF Validation plugin. It creates
- * extension points and adds required dependencies.
- *
- *
- */
-public class ValidationPluginGenerator {
-
- /**
- *
- */
- private static final String CONSTRAINT_S_IS_VIOLATED = "Constraint '%s' is violated"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_TARGET = "target"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_MESSAGE = "message"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_CLASS = "class"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT = "isEnabledByDefault"; //$NON-NLS-1$
-
- private static final String JAVA_LANGUAGE = "Java"; //$NON-NLS-1$
-
- /**
- * Do not use the standard tag OCL but OCLpivot to enforce validation with the pivot variant of OCL.
- * OCLpivot constraint validation is provided by the org.eclipse.papyrus.dsml.validation plugin
- */
- private static final String OCL_LANGUAGE = "OCLpivot"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_MODE = "mode"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_SEVERITY = "severity"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_STATUS_CODE = "statusCode"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_LANG = "lang"; //$NON-NLS-1$
-
- private static final String XML_CONSTRAINT_NAME = "name"; //$NON-NLS-1$
-
- private static final String SEPARATOR = "."; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_CONSTRAINT_CHILD = "constraint"; //$NON-NLS-1$
-
- private static final String ATTRIB_ID = "id"; //$NON-NLS-1$
-
- private static final String ATTRIB_NAME = "name"; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintProviders"; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintBindings"; //$NON-NLS-1$
-
- private static final String UML_PLUGIN = "org.eclipse.uml2.uml"; //$NON-NLS-1$
-
- private static final String EMF_VALIDATION_PLUGIN = "org.eclipse.emf.validation"; //$NON-NLS-1$
-
- private static final String UML_VALIDATION_PLUGIN = "org.eclipse.papyrus.uml.service.validation"; //$NON-NLS-1$
-
- // A generated plugin will depend on the validation profile, since it typically contains the profile as well.
- // [well, that's not always the case]
- public static final String UML_DSML_VALIDATION_PROFILE_PLUGIN = "org.eclipse.papyrus.dsml.validation"; //$NON-NLS-1$
-
- /**
- * singleton
- */
- public static ValidationPluginGenerator instance = new ValidationPluginGenerator();
-
- private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
- private IConstraintsManager constraintsManager;
-
- /**
- * Add a dependency to the plugin hosting the DSML profile.
- *
- * @param project
- * The Eclipse project
- * @return true, if dependency has been added
- * @throws CoreException
- * @throws IOException
- */
- public boolean addDependency(IProject project, String pluginName) throws CoreException, IOException {
-
- if ((project != null) && project.exists() && !pluginName.equals(project.getName())) {
- ManifestEditor manifest = new ManifestEditor(project);
- manifest.init();
- if (manifest.initOk() && !manifest.hasDependency(pluginName)) {
- manifest.addDependency(pluginName);
- manifest.save();
- return true;
- }
- }
- return false;
- }
-
- /**
- * Generate the java code form constraints contained in the profile
- *
- * @param project
- * the Eclipse project
- * @param constraintsManager
- * the class in charge to collect all information from the model
- * @param definition
- * The definition of the profile for which a plugin is generated
- * @throws CoreException
- * @throws IOException
- * @throws SAXException
- * @throws ParserConfigurationException
- */
- public void generate(IProject project, IConstraintsManager constraintsManager, EPackage definition) throws CoreException, IOException, SAXException, ParserConfigurationException {
- PluginEditor editor;
-
- this.constraintsManager = constraintsManager;
-
- // prepare the plugin
- editor = new PluginEditor(project);
- editor.registerSourceFolder(Generate.SRC);
- // it's possible that editor.getManifestEditor() logs an exception due to resource out of sync.
- String pluginID = editor.getSymbolicBundleName();
- if (editor.getBundleName() == null) {
- // initialize bundle name with symbolic name, if not name is given
- editor.setBundleName(pluginID);
- }
- editor.setSingleton(true);
- editor.getBuildEditor().addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE);
- Set<String> natures = new HashSet<String>();
- natures.add(PLUGIN_NATURE_ID);
- editor.addNatures(natures);
-
- editor.getManifestEditor().addDependency(EMF_VALIDATION_PLUGIN);
- editor.getManifestEditor().addDependency(UML_VALIDATION_PLUGIN);
- editor.getManifestEditor().addDependency(UML_PLUGIN);
-
- String filterName = "dsml.validation.generated" + SEPARATOR + this.constraintsManager.getPrimeCategory().getID(); //$NON-NLS-1$
- Element constraintProviderExtension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT, filterName);
-
- // creation of categories extension point
- // that corresponds to profile and sub-profiles
- this.createExtensionForCategory(pluginID, this.constraintsManager.getPrimeCategory(), constraintProviderExtension, editor);
-
- // add the constraint provider extension point, normally it exist only per profile so per category
- for (IConstraintProvider constraintProvider : constraintsManager.getConstraintsProviders()) {
- // create the extension point for the provider
- Element extElForConstraintsProvider = createExtensionForConstraintsProvider(constraintProvider, constraintProviderExtension, editor, definition);
- // go though category (profile)
- for (IConstraintsCategory constraintCategory : constraintProvider.getConstraintsCategories()) {
-
- // create the extension point validationRule for category
- Element extElForConstraintsCategory = createExtensionForConstraintsCategory(pluginID, constraintCategory, extElForConstraintsProvider, editor, constraintsManager);
-
- for (IValidationRule constraint : constraintCategory.getConstraints()) {
-
- // is this a Java constraint?
- if (Utils.hasSpecificationForJava(constraint.getConstraint())) {
- createJavaExtensionForConstraint(pluginID, constraint, extElForConstraintsCategory, editor);
- }
-
- // is this an OCL constraint?
- if (Utils.hasSpecificationForOCL(constraint.getConstraint())) {
- createOCLExtensionForConstraint(constraint, extElForConstraintsCategory, editor);
- }
- // ((ValidationRuleImpl) constraint).setParentID();
- }
-
- }
- }
-
- generateBindings(pluginID, editor, this.constraintsManager, filterName);
-
- try {
- editor.save();
- editor.getProject().refreshLocal(0, null);
- } catch (Throwable ex) {
- return;
- }
- }
-
- private Element createExtensionForConstraint(IValidationRule validationRule,
- Element parentElement, PluginEditor editor) {
-
- Element extElForConstraint = editor.getPluginEditor().addChild(
- parentElement, EMF_VALIDATION_CONSTRAINT_CHILD);
-
- extElForConstraint.setAttribute(ATTRIB_ID, validationRule.getID());
- extElForConstraint.setAttribute(XML_CONSTRAINT_NAME, validationRule.getName());
- extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString());
- extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name());
-
- extElForConstraint.setAttribute(XML_CONSTRAINT_MODE, validationRule.getMode().name());
- extElForConstraint.setAttribute(XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT,
- String.valueOf(validationRule.isEnabledByDefault()));
-
- if (validationRule.getTargets() != null) {
- for (String target : validationRule.getTargets()) {
- Element targetExtension = editor.addChild(extElForConstraint, XML_CONSTRAINT_TARGET);
- targetExtension.setAttribute(XML_CONSTRAINT_CLASS, target);
- }
- }
-
- String validationMsg = validationRule.getMessage();
- Element message = editor.addChild(extElForConstraint, XML_CONSTRAINT_MESSAGE);
- if ((validationMsg != null) && (validationMsg.length() > 0)) {
- message.setTextContent(validationMsg);
- } else {
- Package constraintPkg = validationRule.getConstraint().getNearestPackage();
- boolean set = false;
- if (constraintPkg != null) {
- MessageHandling messageHandling = UMLUtil.getStereotypeApplication(constraintPkg, MessageHandling.class);
- if (messageHandling != null) {
- if (messageHandling.getMessageMode() == NameBasedMsgMode.NAME_IS_MESSAGE) {
- message.setTextContent(validationRule.getName());
- set = true;
- } else if (messageHandling.getMessageMode() == NameBasedMsgMode.CUSTOM_TEMPLATE) {
- String template = messageHandling.getCustomTemplate();
- if (template != null && template.length() > 0) {
- message.setTextContent(String.format(template, validationRule.getName()));
- set = true;
- }
- }
- }
- }
- if (!set) {
- message.setTextContent(String.format(CONSTRAINT_S_IS_VIOLATED, validationRule.getName()));
- }
- }
-
- if (validationRule.getDescription() != null) {
- Element description = editor.addChild(extElForConstraint, "description"); //$NON-NLS-1$
- description.setTextContent(validationRule.getDescription());
- }
-
- return extElForConstraint;
- }
-
- private Element createJavaExtensionForConstraint(String pluginID, IValidationRule validationRule,
- Element parentElement, PluginEditor editor) {
-
- Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor);
-
- extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, JAVA_LANGUAGE);
- extElForConstraint.setAttribute(XML_CONSTRAINT_CLASS, pluginID + SEPARATOR + validationRule.getImplementingClass());
-
- return extElForConstraint;
-
- }
-
- /**
- * create the extension point for constraint of emf validation
- *
- * @param validationRule
- * the validation rule
- * @param parentElement
- * @param editor
- * @return the extension point
- */
- private Element createOCLExtensionForConstraint(IValidationRule validationRule,
- Element parentElement, PluginEditor editor) {
-
- Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor);
-
- extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, OCL_LANGUAGE);
- extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString());
- extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name());
-
- if (Utils.getOCLConstraintBody(validationRule.getConstraint()) != null) {
- Document doc = editor.getDocument();
-
- CDATASection cdata = doc.createCDATASection(Utils
- .getOCLConstraintBody(validationRule.getConstraint()));
- extElForConstraint.appendChild(cdata);
- }
-
- return extElForConstraint;
-
- }
-
- public static Document parseXmlFile(String filename, boolean validating) {
- try {
- // Create a builder factory
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- factory.setValidating(validating);
-
- // Create the builder and parse the file
- Document doc = factory.newDocumentBuilder().parse(
- new File(filename));
- return doc;
- } catch (SAXException e) {
- // A parsing error occurred; the xml input is not valid
- } catch (ParserConfigurationException e) {
- } catch (IOException e) {
- }
- return null;
- }
-
- /**
- * create the extension point categories
- *
- * @param projectName
- * the name of the project
- * @param category
- * a category
- * @param parentElement
- * a ConstraintProviders extension
- * @param editor
- */
- private Element createExtensionForCategory(String pluginID, Category category,
- Element parentElement, PluginEditor editor) {
-
- Element extElForCategory = editor.getPluginEditor().addChild(
- parentElement, "category"); //$NON-NLS-1$
-
- extElForCategory.setAttribute(ATTRIB_ID, pluginID + SEPARATOR + category.getID());
-
- extElForCategory.setAttribute(XML_CONSTRAINT_NAME, pluginID + SEPARATOR + category.getName());
-
- extElForCategory.setAttribute("mandatory", String.valueOf(category.isMandatory())); //$NON-NLS-1$
-
- return extElForCategory;
-
- }
-
- /**
- * create the constraint provider extension point
- *
- * @param constraintProvider
- * @param parentElement
- * @param editor
- * @param definition
- * @return the extension point
- */
- @SuppressWarnings("nls")
- private Element createExtensionForConstraintsProvider(
- IConstraintProvider constraintProvider, Element parentElement,
- PluginEditor editor, EPackage definition) {
-
- Element extElForConstraintsProvider = editor.getPluginEditor().addChild(parentElement, "constraintProvider");
-
- extElForConstraintsProvider.setAttribute(XML_CONSTRAINT_MODE, constraintProvider.getMode().name());
-
- extElForConstraintsProvider.setAttribute("cache", String.valueOf(constraintProvider.getCache()));
-
- Element pcg = editor.addChild(extElForConstraintsProvider, "package");
-
- if (constraintProvider.getEPackage() == null) {
- pcg.setAttribute("namespaceUri", UMLPackage.eNS_URI);
- } else {
- pcg.setAttribute("namespaceUri", constraintProvider.getEPackage().getNsURI());
-
- }
-
- return extElForConstraintsProvider;
- }
-
- @SuppressWarnings("nls")
- private Element createExtensionForConstraintsCategory(String pluginID, IConstraintsCategory constraintsCategory, Element parentElement, PluginEditor editor, IConstraintsManager constraintManager) {
- Element extElForConstraintsCategory = editor.getPluginEditor().addChild(parentElement, "constraints"); //$NON-NLS-1$
- extElForConstraintsCategory.setAttribute("categories", pluginID + SEPARATOR + constraintManager.getPrimeCategory().getName());
- return extElForConstraintsCategory;
-
- }
-
-
- @SuppressWarnings("nls")
- private void generateBindings(String pluginID, PluginEditor editor, IConstraintsManager constraintsManager, String filterName) {
- Element extension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT, filterName);
-
- // create a client context per stereotype
- Set<Stereotype> constrainedStereotype = constraintsManager.getConstraintsOfStereotype().keySet();
- for (Iterator<Stereotype> iterator = constrainedStereotype.iterator(); iterator.hasNext();) {
- Stereotype stereotype = iterator.next();
- // ("+--> create clientContext for the stereotype "+stereotype.getName());
- Element clientContextElement = editor.getPluginEditor().addChild(extension, "clientContext");
- clientContextElement.setAttribute(ATTRIB_ID, stereotype.getName() + "ClientContext");
- Element selectorElement = editor.addChild(clientContextElement, "selector");
- selectorElement.setAttribute(XML_CONSTRAINT_CLASS, pluginID + ".selectors." + stereotype.getName() + "ClientSelector");
-
- // create binding
- List<Constraint> constraints = constraintsManager.getConstraintsOfStereotype().get(stereotype);
- Element bindingelement = editor.getPluginEditor().addChild(extension, "binding");
- bindingelement.setAttribute("context", stereotype.getName() + "ClientContext");
-
- for (Iterator<Constraint> iteratorConstraint = constraints.iterator(); iteratorConstraint.hasNext();) {
- Constraint constraint = iteratorConstraint.next();
- constraintsManager.getValidationRuleMap().get(constraint).getID();
- Element constraintElement = editor.addChild(bindingelement, "constraint");
- // The pluginID must be part of the fully qualified constraint reference
- constraintElement.setAttribute("ref", pluginID + SEPARATOR + constraintsManager.getValidationRuleMap().get(constraint).getID());
- // ("+----> create binding for the constraint "+constraintsManager.getValidationRuleMap().get(constraint).getID());
- }
- }
- }
-
- /**
- * Create a new extension with a given name or reuse an existing extension if an extension with the given
- * name already exists. In case of the latter, the existing extensions will be cleaned first, i.e. all of its
- * children are removed. This function enables multiple generation phases without duplicating elements.
- *
- * CAVEAT: This function has been changed: filtering is now based on its name instead of the ID. Using an
- * ID on the extension point level, unifies the associated contexts, see bug 467692 - [UML-RT] Multiple
- * issues when validating a UML-RT model
- *
- * @param editor
- * the plugin editor
- * @param extensionName
- * the name of the extension
- * @return
- */
- protected Element createOrCleanExtension(PluginEditor editor, String extensionName, String filterName) {
- List<Node> existingExtensions = editor.getPluginEditor().getExtensions(extensionName);
- for (Node extension : existingExtensions) {
- if (extension instanceof Element) {
- Element extensionElement = (Element) extension;
- // use optional name field to identify an item that has been generated by this plugin.
- // Context: bug 464363 - The DSML plugin generator removes all existing constraints from the plugin.xml
- String name = extensionElement.getAttribute(ATTRIB_NAME);
- // TODO: temporary accept entries without ID (ID == "") to avoid migration issues (bug 464363)
- if (name.equals("")) { //$NON-NLS-1$
- extensionElement.setAttribute(ATTRIB_NAME, filterName);
- name = filterName;
- }
- if (name.equals(filterName)) {
- // use existing extension and remove all children
- for (;;) {
- Node child = extension.getFirstChild();
- if (child == null) {
- break;
- }
- extension.removeChild(child);
- }
- return extensionElement;
- }
- }
- }
- // create new extension
- Element newExtension = editor.getPluginEditor().addExtension(extensionName);
- newExtension.setAttribute(ATTRIB_NAME, filterName);
- return newExtension;
- }
-
- public static String getContextprefix() {
- return ""; //$NON-NLS-1$
- }
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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: + * Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation + * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modification + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.dsml.validation.wizard; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling; +import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode; +import org.eclipse.papyrus.dsml.validation.generator.xtend.Generate; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager; +import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule; +import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils; +import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors; +import org.eclipse.uml2.uml.Constraint; +import org.eclipse.uml2.uml.Package; +import org.eclipse.uml2.uml.Stereotype; +import org.eclipse.uml2.uml.UMLPackage; +import org.eclipse.uml2.uml.util.UMLUtil; +import org.w3c.dom.CDATASection; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; + +/** + * This is the main class that generates the EMF Validation plugin. It creates + * extension points and adds required dependencies. + * + * + */ +public class ValidationPluginGenerator { + + /** + * + */ + private static final String CONSTRAINT_S_IS_VIOLATED = "Constraint '%s' is violated"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_TARGET = "target"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_MESSAGE = "message"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_CLASS = "class"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT = "isEnabledByDefault"; //$NON-NLS-1$ + + private static final String JAVA_LANGUAGE = "Java"; //$NON-NLS-1$ + + /** + * Do not use the standard tag OCL but OCLpivot to enforce validation with the pivot variant of OCL. + * OCLpivot constraint validation is provided by the org.eclipse.papyrus.dsml.validation plugin + */ + private static final String OCL_LANGUAGE = "OCLpivot"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_MODE = "mode"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_SEVERITY = "severity"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_STATUS_CODE = "statusCode"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_LANG = "lang"; //$NON-NLS-1$ + + private static final String XML_CONSTRAINT_NAME = "name"; //$NON-NLS-1$ + + private static final String SEPARATOR = "."; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_CONSTRAINT_CHILD = "constraint"; //$NON-NLS-1$ + + private static final String ATTRIB_ID = "id"; //$NON-NLS-1$ + + private static final String ATTRIB_NAME = "name"; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintProviders"; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintBindings"; //$NON-NLS-1$ + + private static final String UML_PLUGIN = "org.eclipse.uml2.uml"; //$NON-NLS-1$ + + private static final String EMF_VALIDATION_PLUGIN = "org.eclipse.emf.validation"; //$NON-NLS-1$ + + private static final String UML_VALIDATION_PLUGIN = "org.eclipse.papyrus.uml.service.validation"; //$NON-NLS-1$ + + // A generated plugin will depend on the validation profile, since it typically contains the profile as well. + // [well, that's not always the case] + public static final String UML_DSML_VALIDATION_PROFILE_PLUGIN = "org.eclipse.papyrus.dsml.validation"; //$NON-NLS-1$ + + /** + * singleton + */ + public static ValidationPluginGenerator instance = new ValidationPluginGenerator(); + + private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$ + + private IConstraintsManager constraintsManager; + + /** + * Add a dependency to the plugin hosting the DSML profile. + * + * @param project + * The Eclipse project + * @return true, if dependency has been added + * @throws CoreException + * @throws IOException + */ + public boolean addDependency(IProject project, String pluginName) throws CoreException, IOException { + + if ((project != null) && project.exists() && !pluginName.equals(project.getName())) { + ManifestEditor manifest = new ManifestEditor(project); + manifest.init(); + if (manifest.initOk() && !manifest.hasDependency(pluginName)) { + manifest.addDependency(pluginName); + manifest.save(); + return true; + } + } + return false; + } + + /** + * Generate the java code form constraints contained in the profile + * + * @param project + * the Eclipse project + * @param constraintsManager + * the class in charge to collect all information from the model + * @param definition + * The definition of the profile for which a plugin is generated + * @throws CoreException + * @throws IOException + * @throws SAXException + * @throws ParserConfigurationException + */ + public void generate(IProject project, IConstraintsManager constraintsManager, EPackage definition) throws CoreException, IOException, SAXException, ParserConfigurationException { + IPluginEditor editor; + + this.constraintsManager = constraintsManager; + + // prepare the plugin + editor = ProjectEditors.getPluginEditor(project); + if (!editor.exists()) { + editor.create(); + } + editor.init(); + + editor.registerSourceFolder(Generate.SRC); + // it's possible that editor.getManifestEditor() logs an exception due to resource out of sync. + String pluginID = editor.getSymbolicBundleName(); + if (editor.getBundleName() == null) { + // initialize bundle name with symbolic name, if not name is given + editor.setBundleName(pluginID); + } + editor.setSingleton(true); + editor.addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE); + Set<String> natures = new HashSet<String>(); + natures.add(PLUGIN_NATURE_ID); + editor.addNatures(natures); + + editor.addDependency(EMF_VALIDATION_PLUGIN); + editor.addDependency(UML_VALIDATION_PLUGIN); + editor.addDependency(UML_PLUGIN); + + String filterName = "dsml.validation.generated" + SEPARATOR + this.constraintsManager.getPrimeCategory().getID(); //$NON-NLS-1$ + Element constraintProviderExtension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT, filterName); + + // creation of categories extension point + // that corresponds to profile and sub-profiles + this.createExtensionForCategory(pluginID, this.constraintsManager.getPrimeCategory(), constraintProviderExtension, editor); + + // add the constraint provider extension point, normally it exist only per profile so per category + for (IConstraintProvider constraintProvider : constraintsManager.getConstraintsProviders()) { + // create the extension point for the provider + Element extElForConstraintsProvider = createExtensionForConstraintsProvider(constraintProvider, constraintProviderExtension, editor, definition); + // go though category (profile) + for (IConstraintsCategory constraintCategory : constraintProvider.getConstraintsCategories()) { + + // create the extension point validationRule for category + Element extElForConstraintsCategory = createExtensionForConstraintsCategory(pluginID, constraintCategory, extElForConstraintsProvider, editor, constraintsManager); + + for (IValidationRule constraint : constraintCategory.getConstraints()) { + + // is this a Java constraint? + if (Utils.hasSpecificationForJava(constraint.getConstraint())) { + createJavaExtensionForConstraint(pluginID, constraint, extElForConstraintsCategory, editor); + } + + // is this an OCL constraint? + if (Utils.hasSpecificationForOCL(constraint.getConstraint())) { + createOCLExtensionForConstraint(constraint, extElForConstraintsCategory, editor); + } + // ((ValidationRuleImpl) constraint).setParentID(); + } + + } + } + + generateBindings(pluginID, editor, this.constraintsManager, filterName); + + try { + editor.save(); + editor.getProject().refreshLocal(0, null); + } catch (Throwable ex) { + return; + } + } + + private Element createExtensionForConstraint(IValidationRule validationRule, + Element parentElement, IPluginEditor editor) { + + Element extElForConstraint = editor.addChild(parentElement, EMF_VALIDATION_CONSTRAINT_CHILD); + + extElForConstraint.setAttribute(ATTRIB_ID, validationRule.getID()); + extElForConstraint.setAttribute(XML_CONSTRAINT_NAME, validationRule.getName()); + extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString()); + extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name()); + + extElForConstraint.setAttribute(XML_CONSTRAINT_MODE, validationRule.getMode().name()); + extElForConstraint.setAttribute(XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT, + String.valueOf(validationRule.isEnabledByDefault())); + + if (validationRule.getTargets() != null) { + for (String target : validationRule.getTargets()) { + Element targetExtension = editor.addChild(extElForConstraint, XML_CONSTRAINT_TARGET); + targetExtension.setAttribute(XML_CONSTRAINT_CLASS, target); + } + } + + String validationMsg = validationRule.getMessage(); + Element message = editor.addChild(extElForConstraint, XML_CONSTRAINT_MESSAGE); + if ((validationMsg != null) && (validationMsg.length() > 0)) { + message.setTextContent(validationMsg); + } else { + Package constraintPkg = validationRule.getConstraint().getNearestPackage(); + boolean set = false; + if (constraintPkg != null) { + MessageHandling messageHandling = UMLUtil.getStereotypeApplication(constraintPkg, MessageHandling.class); + if (messageHandling != null) { + if (messageHandling.getMessageMode() == NameBasedMsgMode.NAME_IS_MESSAGE) { + message.setTextContent(validationRule.getName()); + set = true; + } else if (messageHandling.getMessageMode() == NameBasedMsgMode.CUSTOM_TEMPLATE) { + String template = messageHandling.getCustomTemplate(); + if (template != null && template.length() > 0) { + message.setTextContent(String.format(template, validationRule.getName())); + set = true; + } + } + } + } + if (!set) { + message.setTextContent(String.format(CONSTRAINT_S_IS_VIOLATED, validationRule.getName())); + } + } + + if (validationRule.getDescription() != null) { + Element description = editor.addChild(extElForConstraint, "description"); //$NON-NLS-1$ + description.setTextContent(validationRule.getDescription()); + } + + return extElForConstraint; + } + + private Element createJavaExtensionForConstraint(String pluginID, IValidationRule validationRule, + Element parentElement, IPluginEditor editor) { + + Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor); + + extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, JAVA_LANGUAGE); + extElForConstraint.setAttribute(XML_CONSTRAINT_CLASS, pluginID + SEPARATOR + validationRule.getImplementingClass()); + + return extElForConstraint; + + } + + /** + * create the extension point for constraint of emf validation + * + * @param validationRule + * the validation rule + * @param parentElement + * @param editor + * @return the extension point + */ + private Element createOCLExtensionForConstraint(IValidationRule validationRule, + Element parentElement, IPluginEditor editor) { + + Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor); + + extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, OCL_LANGUAGE); + extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString()); + extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name()); + + if (Utils.getOCLConstraintBody(validationRule.getConstraint()) != null) { + Document doc = editor.getDocument(); + + CDATASection cdata = doc.createCDATASection(Utils + .getOCLConstraintBody(validationRule.getConstraint())); + extElForConstraint.appendChild(cdata); + } + + return extElForConstraint; + + } + + public static Document parseXmlFile(String filename, boolean validating) { + try { + // Create a builder factory + DocumentBuilderFactory factory = DocumentBuilderFactory + .newInstance(); + factory.setValidating(validating); + + // Create the builder and parse the file + Document doc = factory.newDocumentBuilder().parse( + new File(filename)); + return doc; + } catch (SAXException e) { + // A parsing error occurred; the xml input is not valid + } catch (ParserConfigurationException e) { + } catch (IOException e) { + } + return null; + } + + /** + * create the extension point categories + * + * @param projectName + * the name of the project + * @param category + * a category + * @param parentElement + * a ConstraintProviders extension + * @param editor + */ + private Element createExtensionForCategory(String pluginID, Category category, + Element parentElement, IPluginEditor editor) { + + Element extElForCategory = editor.addChild(parentElement, "category"); //$NON-NLS-1$ + + extElForCategory.setAttribute(ATTRIB_ID, pluginID + SEPARATOR + category.getID()); + + extElForCategory.setAttribute(XML_CONSTRAINT_NAME, pluginID + SEPARATOR + category.getName()); + + extElForCategory.setAttribute("mandatory", String.valueOf(category.isMandatory())); //$NON-NLS-1$ + + return extElForCategory; + + } + + /** + * create the constraint provider extension point + * + * @param constraintProvider + * @param parentElement + * @param editor + * @param definition + * @return the extension point + */ + @SuppressWarnings("nls") + private Element createExtensionForConstraintsProvider( + IConstraintProvider constraintProvider, Element parentElement, + IPluginEditor editor, EPackage definition) { + + Element extElForConstraintsProvider = editor.addChild(parentElement, "constraintProvider"); + + extElForConstraintsProvider.setAttribute(XML_CONSTRAINT_MODE, constraintProvider.getMode().name()); + + extElForConstraintsProvider.setAttribute("cache", String.valueOf(constraintProvider.getCache())); + + Element pcg = editor.addChild(extElForConstraintsProvider, "package"); + + if (constraintProvider.getEPackage() == null) { + pcg.setAttribute("namespaceUri", UMLPackage.eNS_URI); + } else { + pcg.setAttribute("namespaceUri", constraintProvider.getEPackage().getNsURI()); + + } + + return extElForConstraintsProvider; + } + + @SuppressWarnings("nls") + private Element createExtensionForConstraintsCategory(String pluginID, IConstraintsCategory constraintsCategory, Element parentElement, IPluginEditor editor, IConstraintsManager constraintManager) { + Element extElForConstraintsCategory = editor.addChild(parentElement, "constraints"); //$NON-NLS-1$ + extElForConstraintsCategory.setAttribute("categories", pluginID + SEPARATOR + constraintManager.getPrimeCategory().getName()); + return extElForConstraintsCategory; + + } + + + @SuppressWarnings("nls") + private void generateBindings(String pluginID, IPluginEditor editor, IConstraintsManager constraintsManager, String filterName) { + Element extension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT, filterName); + + // create a client context per stereotype + Set<Stereotype> constrainedStereotype = constraintsManager.getConstraintsOfStereotype().keySet(); + for (Iterator<Stereotype> iterator = constrainedStereotype.iterator(); iterator.hasNext();) { + Stereotype stereotype = iterator.next(); + // ("+--> create clientContext for the stereotype "+stereotype.getName()); + Element clientContextElement = editor.addChild(extension, "clientContext"); + clientContextElement.setAttribute(ATTRIB_ID, stereotype.getName() + "ClientContext"); + Element selectorElement = editor.addChild(clientContextElement, "selector"); + selectorElement.setAttribute(XML_CONSTRAINT_CLASS, pluginID + ".selectors." + stereotype.getName() + "ClientSelector"); + + // create binding + List<Constraint> constraints = constraintsManager.getConstraintsOfStereotype().get(stereotype); + Element bindingelement = editor.addChild(extension, "binding"); + bindingelement.setAttribute("context", stereotype.getName() + "ClientContext"); + + for (Iterator<Constraint> iteratorConstraint = constraints.iterator(); iteratorConstraint.hasNext();) { + Constraint constraint = iteratorConstraint.next(); + constraintsManager.getValidationRuleMap().get(constraint).getID(); + Element constraintElement = editor.addChild(bindingelement, "constraint"); + // The pluginID must be part of the fully qualified constraint reference + constraintElement.setAttribute("ref", pluginID + SEPARATOR + constraintsManager.getValidationRuleMap().get(constraint).getID()); + // ("+----> create binding for the constraint "+constraintsManager.getValidationRuleMap().get(constraint).getID()); + } + } + } + + /** + * Create a new extension with a given name or reuse an existing extension if an extension with the given + * name already exists. In case of the latter, the existing extensions will be cleaned first, i.e. all of its + * children are removed. This function enables multiple generation phases without duplicating elements. + * + * CAVEAT: This function has been changed: filtering is now based on its name instead of the ID. Using an + * ID on the extension point level, unifies the associated contexts, see bug 467692 - [UML-RT] Multiple + * issues when validating a UML-RT model + * + * @param editor + * the plugin editor + * @param extensionName + * the name of the extension + * @return + */ + protected Element createOrCleanExtension(IPluginEditor editor, String extensionName, String filterName) { + List<Node> existingExtensions = editor.getExtensions(extensionName); + for (Node extension : existingExtensions) { + if (extension instanceof Element) { + Element extensionElement = (Element) extension; + // use optional name field to identify an item that has been generated by this plugin. + // Context: bug 464363 - The DSML plugin generator removes all existing constraints from the plugin.xml + String name = extensionElement.getAttribute(ATTRIB_NAME); + // TODO: temporary accept entries without ID (ID == "") to avoid migration issues (bug 464363) + if (name.equals("")) { //$NON-NLS-1$ + extensionElement.setAttribute(ATTRIB_NAME, filterName); + name = filterName; + } + if (name.equals(filterName)) { + // use existing extension and remove all children + for (;;) { + Node child = extension.getFirstChild(); + if (child == null) { + break; + } + extension.removeChild(child); + } + return extensionElement; + } + } + } + // create new extension + Element newExtension = editor.addExtension(extensionName); + newExtension.setAttribute(ATTRIB_NAME, filterName); + return newExtension; + } + + public static String getContextprefix() { + return ""; //$NON-NLS-1$ + } +} diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project index 97a4a24551d..17da5a7a1c3 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.dev.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.dev.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml index 6b5967ed2f4..d69dae3d247 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.dev.feature" label="Papyrus Developer Tools (Incubation)" - version="1.2.0.qualifier" + version="2.0.0.qualifier" provider-name="Eclipse Modeling Project"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> @@ -190,20 +190,6 @@ http://www.eclipse.org/legal/epl-v10.html unpack="false"/> <plugin - id="org.eclipse.papyrus.tests.framework" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.papyrus.tests.framework.annotations" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.papyrus.tests.framework.edit" download-size="0" install-size="0" @@ -218,13 +204,6 @@ http://www.eclipse.org/legal/epl-v10.html unpack="false"/> <plugin - id="org.eclipse.upr.utp" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.papyrus.dev.types" download-size="0" install-size="0" diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml index e1ee547fc4f..a7a1bfc0342 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>org.eclipse.papyrus.dev.feature</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> @@ -20,11 +20,11 @@ <artifactId>tycho-source-feature-plugin</artifactId> <configuration> <excludes> - <plugin id="org.eclipse.upr.utp" /> <!-- UPR doesn't provide sources --> + <plugin id="org.eclipse.upr.utp"/> <!-- UPR doesn't provide sources --> </excludes> </configuration> </plugin> </plugins> </pluginManagement> </build> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project b/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project index ffa9ad6c0bc..5142b8b03e2 100644 --- a/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project +++ b/features/papyrus-dev-features/org.eclipse.papyrus.junit.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project index 66cc40065d3..d57722d0f9d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project index df4ca5e1028..7df39335613 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.doc.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.doc.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project index 91dee0ba9e2..2f5976755d7 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.editor.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.editor.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project index 09afdd3544b..0e7da471899 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project index e5cbd567ed7..35797d52547 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml index 2d1c24c5b58..de7e335bb93 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.core.feature" label="Papyrus core" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.core.feature" label="Papyrus core" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others. @@ -25,8 +26,6 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.core.pluginexplorer" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome" install-size="0" unpack="false" version="0.0.0"/> - - <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome.nattable" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.tools" install-size="0" unpack="false" version="0.0.0"/> </feature>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml index c30fc7b7fa6..04c21d5606e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project index f5dcf7e5440..0a4edf8ac3c 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.discovery.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.discovery.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml index 856a1f8b7bc..454eff235a1 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/feature.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.discovery.feature" label="Papyrus Discovery Feature UI" plugin="org.eclipse.papyrus.infra.discovery" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.discovery.feature" label="Papyrus Discovery Feature UI" plugin="org.eclipse.papyrus.infra.discovery" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012 CEA LIST diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml index 909e724ea72..57aeba28e7d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.discovery.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project index 44e8c62b070..b28e36777fe 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml index 660c76d091a..980d6d01551 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.emf.feature" label="Papyrus Infra EMF" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.emf.feature" label="Papyrus Infra EMF" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012 CEA LIST diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml index 0255abfbf3f..0c99f7bd244 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project index 7b10b4f919e..c7c280cdbe2 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml index 4efee20e7c3..d02c98ed71a 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. @@ -21,8 +22,6 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.onefile" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.tools" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.edit" install-size="0" unpack="false" version="0.0.0"/> @@ -59,4 +58,4 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.properties.editor" install-size="0" unpack="false" version="0.0.0"/> -</feature>
\ No newline at end of file +</feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml index 3b43a90f6a8..b9ed3b536ae 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project index 7905f6c0105..a4698a301ba 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project index c730aa684ee..f1a57bed486 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project index 6108308f887..ad516f6cd78 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project index 7d564c42456..8ba2d3475ff 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml index a1214fc1e37..60e8795562a 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml @@ -25,8 +25,6 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading.ui" install-size="0" unpack="false" version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.infra.services.validation" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.services.labelprovider" install-size="0" unpack="false" version="0.0.0"/> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project index d670d01258b..f9a6d2573a1 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml index d71c88771f9..1cd6426b3e0 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.ui.feature" label="%featureName" provider-name="%featureProvider" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.ui.feature" label="%featureName" provider-name="%featureProvider" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others. @@ -22,6 +22,8 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.ui.resources" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.ui" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.infra.types.editor" install-size="0" unpack="false" version="0.0.0"/> <plugin download-size="0" id="org.eclipse.papyrus.infra.types.ui" install-size="0" unpack="false" version="0.0.0"/> @@ -29,6 +31,12 @@ http://www.eclipse.org/legal/epl-v10.html <plugin download-size="0" id="org.eclipse.papyrus.infra.services.edit.ui" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading.ui" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.properties.ui" install-size="0" unpack="false" version="0.0.0"/> + <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome.nattable" install-size="0" unpack="false" version="0.0.0"/> + </feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml index 1d7b941c1ec..908e0f77339 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.ui.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project index 9f6d3376c43..933872d0ae3 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project index 581421a35e2..3b379974310 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.widget.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.widget.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml index 557a93d1ded..be36970a5b6 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml index 99c6af530ba..d64b2841a86 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.widget.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project index 5129d7edede..f3924954a3e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/.project @@ -1,17 +1,31 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sdk.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml index a421f6c519c..ad09be5d991 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML" plugin="org.eclipse.papyrus.infra.core" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML" plugin="org.eclipse.papyrus.infra.core" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml index 187fea7ba0d..d08359eab6f 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.sdk.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> +</project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project index fb53f00a244..de36ea91909 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.diagram.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.diagram.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project index 7318149e47c..74b5b3966c5 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project index 6994ec54ff4..ce3bd67b87e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.modelexplorer.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.modelexplorer.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project index f06918a455a..29d11dd0dbb 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project index 7b2b5ea3b10..cee53390b48 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.properties.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.properties.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project index fb5313fabb5..17924f38fd6 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.alf.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.alf.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project index f8bf2f873a0..42e605c3684 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml index cae7df46d7f..475482fabbd 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.assistants.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.uml.assistants.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml index 5c066c9bbe3..ddd4d42bcbc 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.assistants.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project index ba67a87a6d9..be1cb75c601 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project index c936b08cba8..e0b3c9d4d92 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.css.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.css.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project index 4711309f921..47c0a40c9a4 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project index 6b23aa6c20e..bc565f160e9 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml index 6b2b498b058..cf3eddb343e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier"> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier"> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml index bc27b8099c7..3c60b3f8f6e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project index d37e39c6168..b851f459f9e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.modelexplorer.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.modelexplorer.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project index a40675027f9..64716128b8d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project index ef7f9b32f7f..7b25e025f17 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.properties.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.properties.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project index 474134de136..2b93e7543a6 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.search.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.search.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project index 5371e47ca50..f6fe5327bf9 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project index 6a2ee56a5dd..7d8570ac3bd 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.tools.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.tools.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project index f314bf4eae6..7a48e0c0322 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project index 15383c65f3e..4adb5f62a34 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.xtext.integration.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.xtext.integration.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project index bfe5ebe36cc..d45fd70ea4e 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.modelexplorer.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.modelexplorer.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project index 76b17538375..b855c926921 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.properties.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.properties.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project index b8900a96b03..85b0961deb8 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/.project @@ -1,17 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.search.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.search.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project index 7618143509d..0bc70e1b0bf 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/.project @@ -10,8 +10,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project index c1c9b5ec9f9..7679c02f662 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes.emf</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.extendedtypes.emf</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF index fa5476b9585..1d587c3cd42 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF @@ -1,8 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.customization.extendedtypes;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project index 04c2b52c2c3..7d9bff6670c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes.uml</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.extendedtypes.uml</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF index 60932311477..3ebe24c5f4e 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF @@ -1,8 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.customization.extendedtypes;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project index f75d3c9557e..9b0f9d6d912 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.extendedtypes</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF index 0dbaaf4c19c..f6b37ead789 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF @@ -1,7 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/.project b/plugins/customization/org.eclipse.papyrus.customization.palette/.project index cdc3f107099..31cb9051c27 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.palette/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.palette/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.palette</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.palette</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF index ce0a4749a96..db16d3489c6 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF @@ -1,27 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.palette,
- org.eclipse.papyrus.customization.palette.dialog,
- org.eclipse.papyrus.customization.palette.proxies
-Require-Bundle: org.eclipse.pde;bundle-version="3.6.0",
- org.eclipse.pde.ui;bundle-version="3.6.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.palette, + org.eclipse.papyrus.customization.palette.dialog, + org.eclipse.papyrus.customization.palette.proxies +Require-Bundle: org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project index e6fc7832d9a..955406ef912 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.paletteconfiguration</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.papyrus.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.paletteconfiguration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF index 6e7d1118c33..ea75d018a7c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF @@ -1,20 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.paletteconfiguration,
- org.eclipse.papyrus.customization.paletteconfiguration.queries
-Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.paletteconfiguration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.paletteconfiguration, + org.eclipse.papyrus.customization.paletteconfiguration.queries +Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.customization.paletteconfiguration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project index e94613a0d4e..6bd7d558acb 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project @@ -1,38 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties.generation</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.m2m.qvt.oml.project.QVTOBuilder</name>
- <arguments>
- <dictionary>
- <key>src_container</key>
- <value>transforms</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.properties.generation</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.m2m.qvt.oml.project.QVTOBuilder</name> + <arguments> + <dictionary> + <key>src_container</key> + <value>transforms</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF index c0d8e21fed1..28272f0cbd3 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF @@ -1,45 +1,26 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.generation,
- org.eclipse.papyrus.customization.properties.generation.generators,
- org.eclipse.papyrus.customization.properties.generation.layout,
- org.eclipse.papyrus.customization.properties.generation.wizard,
- org.eclipse.papyrus.customization.properties.generation.wizard.widget
-Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
- org.eclipse.osgi;bundle-version="3.6.1",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.m2m.qvt.oml;bundle-version="3.0.1",
- org.eclipse.m2m.qvt.oml.common;bundle-version="2.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0",
- org.eclipse.emf.common.ui;bundle-version="2.6.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.1",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
- org.eclipse.papyrus.customization.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.jface.databinding;bundle-version="1.6.200",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- bin
-Bundle-Version: 1.2.0.qualifier
-Eclipse-BuddyPolicy: dependent
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.generation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.properties.generation, + org.eclipse.papyrus.customization.properties.generation.generators, + org.eclipse.papyrus.customization.properties.generation.layout, + org.eclipse.papyrus.customization.properties.generation.wizard, + org.eclipse.papyrus.customization.properties.generation.wizard.widget +Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)", + org.eclipse.m2m.qvt.oml.project;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.customization.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: ., + bin +Bundle-Version: 1.2.0.qualifier +Eclipse-BuddyPolicy: dependent +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.generation;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project index c206f4a22bc..ada41a4b484 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project @@ -1,38 +1,60 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties.model.xwt</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>
- <buildCommand>
- <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
- <arguments>
- <dictionary>
- <key>src_container</key>
- <value>Transformation</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.properties.model.xwt</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> + <buildCommand> + <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name> + <arguments> + <dictionary> + <key>src_container</key> + <value>Transformation</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF index 1299b08a90f..e991aa76ae3 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF @@ -1,26 +1,20 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.model.xwt.resource,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.m2m.qvt.oml;bundle-version="3.1.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.wst.xml.core;bundle-version="1.1.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
- com.ibm.icu
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.model.xwt.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.model.xwt;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.properties.model.xwt.resource, + org.eclipse.papyrus.customization.properties.model.xwt.xwtxml, + org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl, + org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util +Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)", + org.eclipse.m2m.qvt.oml.project;bundle-version="[3.6.0,4.0.0)", + com.ibm.icu +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.customization.properties.model.xwt.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.model.xwt;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.project b/plugins/customization/org.eclipse.papyrus.customization.properties/.project index 8e74255f24f..8a52bef694f 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/.project +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/.project @@ -1,30 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties</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.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.customization.properties</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF index 357df2e8e0e..991b43e4216 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF @@ -1,37 +1,21 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.editor,
- org.eclipse.papyrus.customization.properties.modelelement,
- org.eclipse.papyrus.customization.properties.providers,
- org.eclipse.papyrus.customization.properties.storage.actions
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.core.databinding.observable;bundle-version="1.3.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0",
- org.eclipse.emf.ecore.editor;bundle-version="2.6.0",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints.ui;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- bin
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.customization.properties.editor, + org.eclipse.papyrus.customization.properties.modelelement, + org.eclipse.papyrus.customization.properties.providers, + org.eclipse.papyrus.customization.properties.storage.actions +Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: ., + bin +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.customization.properties.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF index a70b7b15fc8..fdde98c5b9d 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF @@ -1,23 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui;bundle-version="3.7.0", - org.eclipse.emf.ecore, - org.eclipse.pde;bundle-version="3.6.100", - org.eclipse.core.resources;bundle-version="3.7.100", - org.eclipse.pde.core;bundle-version="3.7.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.pde.ui;bundle-version="3.6.100", - org.eclipse.ui.ide;bundle-version="3.7.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.0", - org.eclipse.emf.edit;bundle-version="2.7.0", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0" +Require-Bundle: org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)", + org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.customization.factory, org.eclipse.papyrus.customization.generator, org.eclipse.papyrus.customization.model.customizationplugin, diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java index 085556890f3..21524cedd5b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java @@ -1,43 +1,43 @@ -/*****************************************************************************
- * 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.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-
-
-public class ConstraintEnvironmentExtensionFactory extends FileBasedExtensionFactory {
-
- public ConstraintEnvironmentExtensionFactory() {
- super("Constraint environment", "org.eclipse.papyrus.infra.constraints.ConstraintEnvironment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.infra.constraints"); //$NON-NLS-1$
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/constraintEnvironment/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getConstraintsEnvironment();
- }
-
-}
+/***************************************************************************** + * 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.customization.factory; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; +import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; + + +public class ConstraintEnvironmentExtensionFactory extends FileBasedExtensionFactory { + + public ConstraintEnvironmentExtensionFactory() { + super("Constraint environment", "org.eclipse.papyrus.infra.constraints.ConstraintEnvironment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } + + @Override + public void addElement(CustomizableElement element, IPluginEditor editor) { + super.addElement(element, editor); + + editor.addDependency("org.eclipse.papyrus.infra.constraints"); //$NON-NLS-1$ + } + + @Override + protected String getTargetPath(FileBasedCustomizableElement element) { + return "/constraintEnvironment/" + getFileName(element); //$NON-NLS-1$ + } + + public EClass getCustomizableElementClass() { + return CustomizationPluginPackage.eINSTANCE.getConstraintsEnvironment(); + } + +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java index 79fe0e89fa2..9f906d6f0fc 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java @@ -1,29 +1,31 @@ -/*****************************************************************************
- * 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.customization.factory;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-
-
-public interface ExtensionFactory {
-
- public static ExtensionFactoryRegistry registry = ExtensionFactoryRegistry.instance;
-
- public void addElement(CustomizableElement element, PluginEditor editor);
-
- public EClass getCustomizableElementClass();
-
- public String getName();
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.customization.factory; + + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; + + +public interface ExtensionFactory { + + public static ExtensionFactoryRegistry registry = ExtensionFactoryRegistry.instance; + + public void addElement(CustomizableElement element, IPluginEditor editor); + + public EClass getCustomizableElementClass(); + + public String getName(); +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java index c230b88c1a1..da15790cf49 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java @@ -1,145 +1,147 @@ -/*****************************************************************************
- * 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.customization.factory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.papyrus.customization.Activator;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.infra.widgets.util.FileUtil;
-import org.w3c.dom.Element;
-
-
-public abstract class FileBasedExtensionFactory implements ExtensionFactory {
-
- protected final String extensionPoint;
-
- protected final String fileAttributeName;
-
- protected final String fileElementName;
-
- protected final boolean allowMultiple;
-
- protected final String name;
-
- public FileBasedExtensionFactory(String name, String extensionPoint, String fileAttributeName, String fileElementName, boolean allowMultiple) {
- this.extensionPoint = extensionPoint;
- this.fileAttributeName = fileAttributeName;
- this.fileElementName = fileElementName;
- this.allowMultiple = allowMultiple;
- this.name = name;
- }
-
- public void addElement(CustomizableElement element, PluginEditor editor) {
- createExtension((FileBasedCustomizableElement) element, editor);
- try {
- copyFile((FileBasedCustomizableElement) element, editor);
- } catch (IOException ex) {
- Activator.log.error(ex);
- }
- }
-
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extensionElement = null;
- if (element instanceof FileBasedCustomizableElement) {
- Element extension = editor.getPluginEditor().addExtension(extensionPoint);
- extensionElement = editor.getPluginEditor().addChild(extension, fileElementName);
- editor.getPluginEditor().setAttribute(extensionElement, fileAttributeName, getTargetPath(element));
- }
- return extensionElement;
- }
-
- protected void copyFile(FileBasedCustomizableElement element, PluginEditor editor) throws FileNotFoundException, IOException {
- copyFile(element.getFile(), getTargetPath(element), editor);
- }
-
- protected void copyFile(String sourcePath, String targetPath, PluginEditor editor) throws FileNotFoundException, IOException {
- File sourceFile = FileUtil.getFile(sourcePath);
- File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + targetPath); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (sourceFile == null) {
- throw new IllegalArgumentException("The source path " + sourcePath + " is not valid");
- }
-
- if (targetFile == null) {
- throw new IllegalArgumentException("The target path " + targetPath + " is not valid");
- }
-
- if (!targetFile.getParentFile().exists()) {
- targetFile.getParentFile().mkdirs();
- }
-
- copy(new FileInputStream(sourceFile), targetFile);
-
- editor.getBuildEditor().addToBuild(targetPath);
- }
-
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/" + getFileName(element); //$NON-NLS-1$
- }
-
- protected String getFileName(FileBasedCustomizableElement element) {
- return getFileName(element.getFile());
- }
-
- protected String getFileName(String path) {
- if (path == null) {
- throw new IllegalArgumentException("File path should not be null");
- }
- String fileName;
- path = path.replace("\\", "/");
- if (path.indexOf("/") < 0) { //$NON-NLS-1$
- fileName = path;
- } else {
- fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$
- }
- return fileName;
- }
-
- protected void copy(InputStream source, File target) throws IOException {
- if (!target.getParentFile().exists()) {
- target.getParentFile().mkdirs();
- }
-
- OutputStream out = new FileOutputStream(target);
- try {
- int c;
-
- while ((c = source.read()) != -1) {
- out.write(c);
- }
-
- } catch (IOException ex) {
- throw ex;
- } finally {
- source.close();
- out.close();
- }
- }
-
- public boolean isValidElement(CustomizableElement element) {
- return element instanceof FileBasedCustomizableElement;
- }
-
- public String getName() {
- return name;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.customization.factory; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.eclipse.papyrus.customization.Activator; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.papyrus.infra.widgets.util.FileUtil; +import org.w3c.dom.Element; + + +public abstract class FileBasedExtensionFactory implements ExtensionFactory { + + protected final String extensionPoint; + + protected final String fileAttributeName; + + protected final String fileElementName; + + protected final boolean allowMultiple; + + protected final String name; + + public FileBasedExtensionFactory(String name, String extensionPoint, String fileAttributeName, String fileElementName, boolean allowMultiple) { + this.extensionPoint = extensionPoint; + this.fileAttributeName = fileAttributeName; + this.fileElementName = fileElementName; + this.allowMultiple = allowMultiple; + this.name = name; + } + + public void addElement(CustomizableElement element, IPluginEditor editor) { + createExtension((FileBasedCustomizableElement) element, editor); + try { + copyFile((FileBasedCustomizableElement) element, editor); + } catch (IOException ex) { + Activator.log.error(ex); + } + } + + protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) { + Element extensionElement = null; + if (element instanceof FileBasedCustomizableElement) { + Element extension = editor.addExtension(extensionPoint); + extensionElement = editor.addChild(extension, fileElementName); + editor.setAttribute(extensionElement, fileAttributeName, getTargetPath(element)); + } + return extensionElement; + } + + protected void copyFile(FileBasedCustomizableElement element, IPluginEditor editor) throws FileNotFoundException, IOException { + copyFile(element.getFile(), getTargetPath(element), editor); + } + + protected void copyFile(String sourcePath, String targetPath, IPluginEditor editor) throws FileNotFoundException, IOException { + File sourceFile = FileUtil.getFile(sourcePath); + File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + targetPath); //$NON-NLS-1$ //$NON-NLS-2$ + + if (sourceFile == null) { + throw new IllegalArgumentException("The source path " + sourcePath + " is not valid"); + } + + if (targetFile == null) { + throw new IllegalArgumentException("The target path " + targetPath + " is not valid"); + } + + if (!targetFile.getParentFile().exists()) { + targetFile.getParentFile().mkdirs(); + } + + copy(new FileInputStream(sourceFile), targetFile); + + editor.addToBuild(targetPath); + } + + protected String getTargetPath(FileBasedCustomizableElement element) { + return "/" + getFileName(element); //$NON-NLS-1$ + } + + protected String getFileName(FileBasedCustomizableElement element) { + return getFileName(element.getFile()); + } + + protected String getFileName(String path) { + if (path == null) { + throw new IllegalArgumentException("File path should not be null"); + } + String fileName; + path = path.replace("\\", "/"); + if (path.indexOf("/") < 0) { //$NON-NLS-1$ + fileName = path; + } else { + fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$ + } + return fileName; + } + + protected void copy(InputStream source, File target) throws IOException { + if (!target.getParentFile().exists()) { + target.getParentFile().mkdirs(); + } + + OutputStream out = new FileOutputStream(target); + try { + int c; + + while ((c = source.read()) != -1) { + out.write(c); + } + + } catch (IOException ex) { + throw ex; + } finally { + source.close(); + out.close(); + } + } + + public boolean isValidElement(CustomizableElement element) { + return element instanceof FileBasedCustomizableElement; + } + + public String getName() { + return name; + } + +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java index 6394ddc451d..38ff8e1f3fb 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java @@ -1,67 +1,67 @@ -/*****************************************************************************
- * 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.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.ModelTemplate;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.w3c.dom.Element;
-
-
-public class ModelTemplateExtensionFactory extends FileBasedExtensionFactory {
-
- public ModelTemplateExtensionFactory() {
- super(Messages.ModelTemplateExtensionFactory_ModelTemplate, "org.eclipse.papyrus.uml.diagram.wizards.templates", "file", "template", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.uml.diagram.wizards"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement customizableElement, PluginEditor editor) {
- Element extension = super.createExtension(customizableElement, editor);
- if (customizableElement instanceof ModelTemplate) {
- ModelTemplate element = (ModelTemplate) customizableElement;
-
- extension.setAttribute("id", element.getId()); //$NON-NLS-1$
-
- if (element.getName() != null) {
- extension.setAttribute("name", element.getName()); //$NON-NLS-1$
- }
-
- if (element.getLanguage() != null) {
- extension.setAttribute("language", element.getLanguage()); //$NON-NLS-1$
- }
-
- // TODO: Papyrus now handles *.di and *.notation files
- }
-
- return extension;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/modelTemplate/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getModelTemplate();
- }
-}
+/***************************************************************************** + * 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.customization.factory; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.messages.Messages; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; +import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.ModelTemplate; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.w3c.dom.Element; + + +public class ModelTemplateExtensionFactory extends FileBasedExtensionFactory { + + public ModelTemplateExtensionFactory() { + super(Messages.ModelTemplateExtensionFactory_ModelTemplate, "org.eclipse.papyrus.uml.diagram.wizards.templates", "file", "template", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + @Override + public void addElement(CustomizableElement element, IPluginEditor editor) { + super.addElement(element, editor); + + editor.addDependency("org.eclipse.papyrus.uml.diagram.wizards"); //$NON-NLS-1$ + } + + @Override + protected Element createExtension(FileBasedCustomizableElement customizableElement, IPluginEditor editor) { + Element extension = super.createExtension(customizableElement, editor); + if (customizableElement instanceof ModelTemplate) { + ModelTemplate element = (ModelTemplate) customizableElement; + + extension.setAttribute("id", element.getId()); //$NON-NLS-1$ + + if (element.getName() != null) { + extension.setAttribute("name", element.getName()); //$NON-NLS-1$ + } + + if (element.getLanguage() != null) { + extension.setAttribute("language", element.getLanguage()); //$NON-NLS-1$ + } + + // TODO: Papyrus now handles *.di and *.notation files + } + + return extension; + } + + @Override + protected String getTargetPath(FileBasedCustomizableElement element) { + return "/modelTemplate/" + getFileName(element); //$NON-NLS-1$ + } + + public EClass getCustomizableElementClass() { + return CustomizationPluginPackage.eINSTANCE.getModelTemplate(); + } +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java index 1b0dec3ae1b..1c31b0e4249 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java @@ -1,108 +1,108 @@ -/*****************************************************************************
- * 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.customization.factory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.Activator;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.Profile;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.infra.widgets.util.FileUtil;
-import org.w3c.dom.Element;
-
-
-public class ProfileExtensionFactory extends FileBasedExtensionFactory {
-
- public ProfileExtensionFactory() {
- super(Messages.ProfileExtensionFactory_Profile, "org.eclipse.papyrus.uml.extensionpoints.UMLProfile", "path", "profile", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extension = super.createExtension(element, editor);
- Profile profile = (Profile) element;
-
- extension.setAttribute("name", profile.getName()); //$NON-NLS-1$
-
- if (profile.getDescription() != null) {
- extension.setAttribute("description", profile.getDescription()); //$NON-NLS-1$
- }
-
- if (profile.getIconpath() != null && !profile.getIconpath().trim().equals("")) {
- //extension.setAttribute("iconpath", profile.getIconpath()); //$NON-NLS-1$
- copyIcon(profile.getIconpath(), editor);
- extension.setAttribute("iconpath", getIconPath(profile.getIconpath())); //$NON-NLS-1$
- }
-
- if (profile.getProvider() != null) {
- extension.setAttribute("provider", profile.getProvider()); //$NON-NLS-1$
- }
-
- return extension;
- }
-
- protected void copyIcon(String path, PluginEditor editor) {
- File sourceFile = FileUtil.getFile(path);
- File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + getIconPath(path)); //$NON-NLS-1$ //$NON-NLS-2$
- if (!targetFile.getParentFile().exists()) {
- targetFile.getParentFile().mkdirs();
- }
-
- try {
- copy(new FileInputStream(sourceFile), targetFile);
- } catch (IOException ex) {
- Activator.log.error(ex);
- }
-
- editor.getBuildEditor().addToBuild("icons/"); //$NON-NLS-1$
- }
-
- protected String getIconPath(String path) {
- return "icons/" + getFileName(path); //$NON-NLS-1$
- }
-
- @Override
- protected String getFileName(String path) {
- String fileName;
- path = path.replace("\\", "/");
- if (path.indexOf("/") < 0) { //$NON-NLS-1$
- fileName = path;
- } else {
- fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$
- }
- return fileName;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/umlProfile/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getProfile();
- }
-
-}
+/***************************************************************************** + * 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.customization.factory; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.Activator; +import org.eclipse.papyrus.customization.messages.Messages; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; +import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.Profile; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.papyrus.infra.widgets.util.FileUtil; +import org.w3c.dom.Element; + + +public class ProfileExtensionFactory extends FileBasedExtensionFactory { + + public ProfileExtensionFactory() { + super(Messages.ProfileExtensionFactory_Profile, "org.eclipse.papyrus.uml.extensionpoints.UMLProfile", "path", "profile", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + @Override + public void addElement(CustomizableElement element, IPluginEditor editor) { + super.addElement(element, editor); + + editor.addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$ + } + + @Override + protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) { + Element extension = super.createExtension(element, editor); + Profile profile = (Profile) element; + + extension.setAttribute("name", profile.getName()); //$NON-NLS-1$ + + if (profile.getDescription() != null) { + extension.setAttribute("description", profile.getDescription()); //$NON-NLS-1$ + } + + if (profile.getIconpath() != null && !profile.getIconpath().trim().equals("")) { + // extension.setAttribute("iconpath", profile.getIconpath()); //$NON-NLS-1$ + copyIcon(profile.getIconpath(), editor); + extension.setAttribute("iconpath", getIconPath(profile.getIconpath())); //$NON-NLS-1$ + } + + if (profile.getProvider() != null) { + extension.setAttribute("provider", profile.getProvider()); //$NON-NLS-1$ + } + + return extension; + } + + protected void copyIcon(String path, IPluginEditor editor) { + File sourceFile = FileUtil.getFile(path); + File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + getIconPath(path)); //$NON-NLS-1$ //$NON-NLS-2$ + if (!targetFile.getParentFile().exists()) { + targetFile.getParentFile().mkdirs(); + } + + try { + copy(new FileInputStream(sourceFile), targetFile); + } catch (IOException ex) { + Activator.log.error(ex); + } + + editor.addToBuild("icons/"); //$NON-NLS-1$ + } + + protected String getIconPath(String path) { + return "icons/" + getFileName(path); //$NON-NLS-1$ + } + + @Override + protected String getFileName(String path) { + String fileName; + path = path.replace("\\", "/"); + if (path.indexOf("/") < 0) { //$NON-NLS-1$ + fileName = path; + } else { + fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$ + } + return fileName; + } + + @Override + protected String getTargetPath(FileBasedCustomizableElement element) { + return "/umlProfile/" + getFileName(element); //$NON-NLS-1$ + } + + public EClass getCustomizableElementClass() { + return CustomizationPluginPackage.eINSTANCE.getProfile(); + } + +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java index 0556f997b09..87925310204 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java @@ -16,7 +16,7 @@ import org.eclipse.papyrus.customization.messages.Messages; import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; -import org.eclipse.papyrus.customization.plugin.PluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; public class PropertyViewEnvironmentExtensionFactory extends FileBasedExtensionFactory { @@ -26,10 +26,10 @@ public class PropertyViewEnvironmentExtensionFactory extends FileBasedExtensionF } @Override - public void addElement(CustomizableElement element, PluginEditor editor) { + public void addElement(CustomizableElement element, IPluginEditor editor) { super.addElement(element, editor); - editor.getManifestEditor().addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$ + editor.addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$ } @Override diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java index f8cb820e7d0..0d63ba62360 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java @@ -36,7 +36,7 @@ import org.eclipse.papyrus.customization.messages.Messages; import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; -import org.eclipse.papyrus.customization.plugin.PluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.widgets.util.FileUtil; @@ -53,21 +53,21 @@ public class PropertyViewExtensionFactory extends FileBasedExtensionFactory { } @Override - public void addElement(CustomizableElement element, PluginEditor editor) { + public void addElement(CustomizableElement element, IPluginEditor editor) { super.addElement(element, editor); - editor.getManifestEditor().addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$ + editor.addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$ } @Override - protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) { + protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) { Element extension = super.createExtension(element, editor); // extension.setAttribute("loadDefault", ((PropertyView)element).isLoadDefault() ? "true" : "false"); return extension; } @Override - protected void copyFile(FileBasedCustomizableElement element, PluginEditor editor) { + protected void copyFile(FileBasedCustomizableElement element, IPluginEditor editor) { String path = element.getFile(); File sourceFile = FileUtil.getFile(path); URI uri = URI.createFileURI(sourceFile.getAbsolutePath()); @@ -93,7 +93,7 @@ public class PropertyViewExtensionFactory extends FileBasedExtensionFactory { // Activator.log.error(ex); // } // - editor.getBuildEditor().addToBuild("propertyView/"); + editor.addToBuild("propertyView/"); } private void copyAll(final Context source, final File target) { diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java index 7b2fa90e872..ee17c2018cb 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java @@ -1,54 +1,54 @@ -/*****************************************************************************
- * 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.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.UICustom;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.w3c.dom.Element;
-
-
-
-public class UICustomExtensionFactory extends FileBasedExtensionFactory {
-
- public UICustomExtensionFactory() {
- super(Messages.UICustomExtensionFactory_UICustom, "org.eclipse.emf.facet.infra.browser.custom.core.registration", "file", "browserCustomization", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.emf.facet.infra.browser.custom"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extension = super.createExtension(element, editor);
- extension.setAttribute("loadByDefault", ((UICustom) element).isLoadByDefault() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return extension;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/uiCustom/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getUICustom();
- }
-
-}
+/***************************************************************************** + * 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.customization.factory; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.messages.Messages; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; +import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.UICustom; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.w3c.dom.Element; + + + +public class UICustomExtensionFactory extends FileBasedExtensionFactory { + + public UICustomExtensionFactory() { + super(Messages.UICustomExtensionFactory_UICustom, "org.eclipse.emf.facet.infra.browser.custom.core.registration", "file", "browserCustomization", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + @Override + public void addElement(CustomizableElement element, IPluginEditor editor) { + super.addElement(element, editor); + + editor.addDependency("org.eclipse.emf.facet.infra.browser.custom"); //$NON-NLS-1$ + } + + @Override + protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) { + Element extension = super.createExtension(element, editor); + extension.setAttribute("loadByDefault", ((UICustom) element).isLoadByDefault() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return extension; + } + + @Override + protected String getTargetPath(FileBasedCustomizableElement element) { + return "/uiCustom/" + getFileName(element); //$NON-NLS-1$ + } + + public EClass getCustomizableElementClass() { + return CustomizationPluginPackage.eINSTANCE.getUICustom(); + } + +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java index 3e9015b40ee..df7b3359ee5 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java @@ -1,69 +1,69 @@ -/*****************************************************************************
- * 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.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.UMLModel;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.w3c.dom.Element;
-
-
-public class UMLModelExtensionFactory extends FileBasedExtensionFactory {
-
- public UMLModelExtensionFactory() {
- super(Messages.UMLModelExtensionFactory_UMLModel, "org.eclipse.papyrus.uml.extensionpoints.UMLLibrary", "path", "library", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extension = super.createExtension(element, editor);
- UMLModel model = (UMLModel) element;
-
- if (model.getDescription() != null) {
- extension.setAttribute("description", model.getDescription()); //$NON-NLS-1$
- }
-
- if (model.getIconpath() != null) {
- extension.setAttribute("iconpath", model.getIconpath()); //$NON-NLS-1$
- }
-
- if (model.getName() != null) {
- extension.setAttribute("name", model.getName()); //$NON-NLS-1$
- }
-
- if (model.getProvider() != null) {
- extension.setAttribute("provider", model.getProvider()); //$NON-NLS-1$
- }
-
- return extension;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/umlLibrary/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getUMLModel();
- }
-}
+/***************************************************************************** + * 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.customization.factory; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.papyrus.customization.messages.Messages; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage; +import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.UMLModel; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.w3c.dom.Element; + + +public class UMLModelExtensionFactory extends FileBasedExtensionFactory { + + public UMLModelExtensionFactory() { + super(Messages.UMLModelExtensionFactory_UMLModel, "org.eclipse.papyrus.uml.extensionpoints.UMLLibrary", "path", "library", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + @Override + public void addElement(CustomizableElement element, IPluginEditor editor) { + super.addElement(element, editor); + + editor.addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$ + } + + @Override + protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) { + Element extension = super.createExtension(element, editor); + UMLModel model = (UMLModel) element; + + if (model.getDescription() != null) { + extension.setAttribute("description", model.getDescription()); //$NON-NLS-1$ + } + + if (model.getIconpath() != null) { + extension.setAttribute("iconpath", model.getIconpath()); //$NON-NLS-1$ + } + + if (model.getName() != null) { + extension.setAttribute("name", model.getName()); //$NON-NLS-1$ + } + + if (model.getProvider() != null) { + extension.setAttribute("provider", model.getProvider()); //$NON-NLS-1$ + } + + return extension; + } + + @Override + protected String getTargetPath(FileBasedCustomizableElement element) { + return "/umlLibrary/" + getFileName(element); //$NON-NLS-1$ + } + + public EClass getCustomizableElementClass() { + return CustomizationPluginPackage.eINSTANCE.getUMLModel(); + } +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java index d8976a7ad97..62dd9141f0c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java @@ -1,94 +1,98 @@ -/*****************************************************************************
- * 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.customization.generator;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.customization.Activator;
-import org.eclipse.papyrus.customization.factory.ExtensionFactory;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationConfiguration;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.xml.sax.SAXException;
-
-public class PluginGenerator {
-
- public static PluginGenerator instance = new PluginGenerator();
-
- private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
- public void generate(IProject project, CustomizationConfiguration configuration) throws CoreException, IOException, SAXException, ParserConfigurationException {
- PluginEditor editor;
-
- editor = new PluginEditor(project);
-
- // editor.addNature("org.eclipse.jdt.core.javanature");
-
- Set<String> natures = new HashSet<String>();
- natures.add(PLUGIN_NATURE_ID);
- editor.addNatures(natures);
- editor.setSingleton(true);
-
- for (CustomizableElement element : configuration.getElements()) {
- ExtensionFactory factory = getFactory(element);
- if (factory != null) {
- factory.addElement(element, editor);
- } else {
- Activator.log.warn(Messages.PluginGenerator_factoryNotFound + element.eClass());
- }
- }
-
- editor.save();
-
-
- if (editor.getPluginEditor().exists()) {
- editor.getBuildEditor().addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE);
- editor.getBuildEditor().save();
- }
-
- String pluginId = configuration.getPlugin();
- Resource resource = configuration.eResource();
- URI uri = URI.createPlatformResourceURI(pluginId + "/customizationConfiguration.xmi", true); //$NON-NLS-1$
- if (resource == null) {
- ResourceSet resourceSet = new ResourceSetImpl();
- resource = resourceSet.createResource(uri);
- resource.getContents().add(configuration);
- } else {
- configuration.eResource().setURI(uri);
- }
-
- configuration.eResource().save(Collections.EMPTY_MAP);
-
- editor.getProject().refreshLocal(0, null);
- }
-
- private ExtensionFactory getFactory(CustomizableElement element) {
- ExtensionFactory factory = ExtensionFactory.registry.getFactory(element.eClass());
- return factory;
- }
-
- private PluginGenerator() {
- }
-}
+/***************************************************************************** + * 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.customization.generator; + +import java.io.IOException; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.papyrus.customization.Activator; +import org.eclipse.papyrus.customization.factory.ExtensionFactory; +import org.eclipse.papyrus.customization.messages.Messages; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement; +import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationConfiguration; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors; +import org.xml.sax.SAXException; + +public class PluginGenerator { + + public static PluginGenerator instance = new PluginGenerator(); + + private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$ + + public void generate(IProject project, CustomizationConfiguration configuration) throws CoreException, IOException, SAXException, ParserConfigurationException { + IPluginEditor editor; + + editor = ProjectEditors.getPluginEditor(project); + if (!editor.exists()) { + editor.create(); + } + editor.init(); + + // editor.addNature("org.eclipse.jdt.core.javanature"); + + Set<String> natures = new HashSet<String>(); + natures.add(PLUGIN_NATURE_ID); + editor.addNatures(natures); + editor.setSingleton(true); + + for (CustomizableElement element : configuration.getElements()) { + ExtensionFactory factory = getFactory(element); + if (factory != null) { + factory.addElement(element, editor); + } else { + Activator.log.warn(Messages.PluginGenerator_factoryNotFound + element.eClass()); + } + } + + editor.save(); + + if (editor.pluginManifestExists()) { + editor.addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE); + editor.save(); + } + + String pluginId = configuration.getPlugin(); + Resource resource = configuration.eResource(); + URI uri = URI.createPlatformResourceURI(pluginId + "/customizationConfiguration.xmi", true); //$NON-NLS-1$ + if (resource == null) { + ResourceSet resourceSet = new ResourceSetImpl(); + resource = resourceSet.createResource(uri); + resource.getContents().add(configuration); + } else { + configuration.eResource().setURI(uri); + } + + configuration.eResource().save(Collections.EMPTY_MAP); + + editor.getProject().refreshLocal(0, null); + } + + private ExtensionFactory getFactory(CustomizableElement element) { + ExtensionFactory factory = ExtensionFactory.registry.getFactory(element.eClass()); + return factory; + } + + private PluginGenerator() { + } +} diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java index eb61d0b73e5..8c6abf404a4 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java @@ -1,217 +1,40 @@ -/*****************************************************************************
- * 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.customization.plugin;
-
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.papyrus.eclipse.project.editors.file.BuildEditor;
-import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.eclipse.papyrus.eclipse.project.editors.project.PluginProjectEditor;
-import org.xml.sax.SAXException;
-
-public class PluginEditor extends PluginProjectEditor implements IPluginProjectEditor, IManifestEditor, IBuildEditor {
-
- protected IManifestEditor manifest;
-
- protected IBuildEditor build;
-
- public PluginEditor(IProject project) throws CoreException, IOException, SAXException, ParserConfigurationException {
- super(project);
- manifest = new ManifestEditor(project);
- build = new BuildEditor(project);
-
- manifest.init();
- build.init();
- if (!exists()) {
- create();
- }
- init();
- }
-
- public PluginProjectEditor getPluginEditor() {
- return this;
- }
-
- public IManifestEditor getManifestEditor() {
- return manifest;
- }
-
- public IBuildEditor getBuildEditor() {
- return build;
- }
-
- public void registerSourceFolder(String source) {
- build.registerSourceFolder(source);
- }
-
- public void addToBuild(String path) {
- build.addToBuild(path);
- }
-
- public String[] getSourceFolders() {
- return build.getSourceFolders();
- }
-
- public void addDependency(String dependency) {
- manifest.addDependency(dependency);
- }
-
- public void addDependency(String dependency, String version) {
- manifest.addDependency(dependency, version);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#hasDependency(java.lang.String)
- *
- * @param dependency
- * @return
- */
- public boolean hasDependency(String dependency) {
- return manifest.hasDependency(dependency);
- }
-
- public void setValue(String key, String value) {
- manifest.setValue(key, value);
- }
-
- public void setValue(String key, String name, String value) {
- manifest.setValue(key, name, value);
- }
-
- public void removeValue(String key, String value) {
- manifest.removeValue(key, value);
- }
-
- public void removeValue(String key) {
- manifest.removeValue(key);
- }
-
- public void setBundleName(String name) {
- manifest.setBundleName(name);
- }
-
- public String getSymbolicBundleName() {
- return manifest.getSymbolicBundleName();
- }
-
- public String getBundleVersion() {
- return manifest.getBundleVersion();
- }
-
- public void setBundleVersion(String version) {
- manifest.setBundleVersion(version);
- }
-
- @Override
- public void save() {
- super.save();
- manifest.save();
- build.save();
- }
-
- public void registerBinFolder(String binFolder) {
- build.registerBinFolder(binFolder);
- }
-
- public void removeFromBuild(String path) {
- build.removeFromBuild(path);
- }
-
- public boolean isRegisteredSourceFolder(String path) {
- return build.isRegisteredSourceFolder(path);
- }
-
- public boolean isRegisteredBinFolder(String binFolder) {
- return build.isRegisteredBinFolder(binFolder);
- }
-
- public String[] getElementsInBuild() {
- return build.getElementsInBuild();
- }
-
- public String getBundleVendor() {
- return manifest.getBundleVendor();
- }
-
- public void setBundleVendor(String vendor) {
- manifest.setBundleVendor(vendor);
- }
-
- public String getValue(String key) {
- return manifest.getValue(key);
- }
-
- public void setSymbolicBundleName(String name) {
- manifest.setSymbolicBundleName(name);
- }
-
- public String getBundleName() {
- return manifest.getBundleName();
- }
-
- public String getBundleLocalization() {
- return manifest.getBundleLocalization();
- }
-
- public void setSingleton(boolean singleton) {
- manifest.setSingleton(singleton);
- }
-
- public void setDependenciesVersion(String dependencyPattern, String newVersion) {
- manifest.setDependenciesVersion(dependencyPattern, newVersion);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String)
- *
- * @param packageName
- */
- public void addImportPackage(String packageName) {
- manifest.addImportPackage(packageName);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String, java.lang.String)
- *
- * @param packageName
- * @param version
- */
- public void addImportPackage(String packageName, String version) {
- manifest.addImportPackage(packageName, version);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String)
- *
- * @param packageName
- */
- public void addExportPackage(String packageName) {
- manifest.addExportPackage(packageName);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String, java.lang.String)
- *
- * @param packageName
- * @param version
- */
- public void addExportPackage(String packageName, String version) {
- manifest.addExportPackage(packageName, version);
- }
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.customization.plugin; + +import java.io.IOException; + +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors; +import org.xml.sax.SAXException; + +/** + * @deprecated Use the {@link ProjectEditors#getPluginEditor(IProject)} API, instead. + */ +@Deprecated +public class PluginEditor extends org.eclipse.papyrus.eclipse.project.editors.project.PluginEditor { + + public PluginEditor(IProject project) throws CoreException, IOException, SAXException, ParserConfigurationException { + super(project); + + if (!exists()) { + create(); + } + + init(); + } +} diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project index f3f5d526a87..6c9a959a7fb 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF index edde45f37f3..188997cd46a 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF @@ -1,17 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider,
- org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.common;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.uml2.common.edit;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider, + org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project index 28ffbba4a5a..9224a1d644d 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF index 79d57e3029e..c59799a1b5f 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF @@ -1,20 +1,14 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation,
- org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.expansion.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.common
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation, + org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.project b/plugins/developer/org.eclipse.papyrus.codegen/.project index b64a36a87a7..baf242b17b7 100644 --- a/plugins/developer/org.eclipse.papyrus.codegen/.project +++ b/plugins/developer/org.eclipse.papyrus.codegen/.project @@ -1,34 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.codegen</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>
- <buildCommand>
- <name>org.openarchitectureware.base.oawBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.openarchitectureware.base.oawNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.codegen</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.openarchitectureware.base.oawBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.openarchitectureware.base.oawNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF index 4b70d2d62ee..b899aaefdd3 100644 --- a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF @@ -1,21 +1,19 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.codegen;x-internal:=true,
- org.eclipse.papyrus.codegen.actions;x-internal:=true
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.codegen;bundle-version="2.1.0",
- org.eclipse.gmf.codegen.ui;bundle-version="1.1.0",
- org.eclipse.gmf.codegen.xtend;bundle-version="1.0.0",
- org.eclipse.gmf.codegen.xtend.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.def;bundle-version="1.2.0",
- org.eclipse.papyrus.gmfgenextension;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.codegen.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.codegen;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.codegen;x-internal:=true, + org.eclipse.papyrus.codegen.actions;x-internal:=true +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.gmf.codegen.ui;bundle-version="[1.3.0,2.0.0)", + org.eclipse.gmf.codegen.xtend;bundle-version="[1.0.0,2.0.0)", + org.eclipse.gmf.codegen.xtend.ui;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.def;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.gmfgenextension;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.codegen.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.codegen;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/developer/org.eclipse.papyrus.def/.project b/plugins/developer/org.eclipse.papyrus.def/.project index c70c4b4fa47..60684c34fbb 100644 --- a/plugins/developer/org.eclipse.papyrus.def/.project +++ b/plugins/developer/org.eclipse.papyrus.def/.project @@ -1,56 +1,69 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.def</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <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>
- <buildCommand>
- <name>org.openarchitectureware.base.oawBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.gmf.xpand.oawBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.gmf.xpand.xpandBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtend.shared.ui.xtendBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.openarchitectureware.base.oawNature</nature>
- <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.def</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.openarchitectureware.base.oawBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.gmf.xpand.oawBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.gmf.xpand.xpandBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.xtend.shared.ui.xtendBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.openarchitectureware.base.oawNature</nature> + <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF index c5b4c74a36f..6508a073938 100644 --- a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF @@ -1,22 +1,17 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.codegen.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)", - org.eclipse.gmf.runtime.notation, - org.eclipse.gmf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, - org.eclipse.gmf.validate;bundle-version="[1.1.0,2.0.0)", - org.eclipse.gmf.codegen;bundle-version="[2.0.0,3.1.0)", - org.eclipse.gmf.graphdef;bundle-version="[2.0.0,3.0.0)", - org.eclipse.xtext;bundle-version="2.3.1", - org.eclipse.xtext.builder;bundle-version="2.3.1", - org.eclipse.xtend.lib, - org.eclipse.ocl.ecore, - com.google.guava;bundle-version="11.0.0", - org.eclipse.xtext.xbase.lib, - org.eclipse.gmf.codegen.xtend;bundle-version="1.0.0", - org.eclipse.papyrus.gmfgenextension;bundle-version="1.2.0" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)", + org.eclipse.gmf.common;bundle-version="[1.3.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.validate;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.graphdef;bundle-version="[2.9.0,3.0.0)", + org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.gmf.codegen.xtend;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.gmfgenextension;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ClassPath: . Bundle-Version: 1.2.0.qualifier diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.project b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.project index 0f4baa86bfe..3aa1fd0795f 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.project +++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.project @@ -21,8 +21,20 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> @@ -30,5 +42,6 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF index bc0d0de5aa9..2bb63750a93 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF @@ -1,31 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib.macro;bundle-version="2.8.0",
- org.eclipse.ui.workbench;bundle-version="3.107.0",
- org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.gmf.codegen;bundle-version="2.11.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.dev.assistants.codegen.internal.Activator
-Bundle-Description: %description
-Bundle-SymbolicName: org.eclipse.papyrus.dev.assistants.codegen;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)", + org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.codegen;bundle-version="[2.11.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.dev.assistants.codegen.internal.Activator +Bundle-Description: %description +Bundle-SymbolicName: org.eclipse.papyrus.dev.assistants.codegen;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.classpath b/plugins/developer/org.eclipse.papyrus.dev.project.management/.classpath index 64c5e31b7a2..eca7bdba8f0 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.classpath +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/.classpath @@ -1,6 +1,6 @@ <?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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.project b/plugins/developer/org.eclipse.papyrus.dev.project.management/.project index f7bd68fe1d4..7aec7f23e53 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.project +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/.project @@ -16,13 +16,26 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs index c585cc455ae..b3aa6d60f94 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ 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.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF index 31ac5c90774..d9d0c94d5a8 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF @@ -1,17 +1,22 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.commands,
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.pde.ui,
- org.eclipse.ui.ide;bundle-version="3.10.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.dev.project.management.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.dev.project.management;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[2.0.0,3.0.0)", + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.dev.project.management.Activator +Bundle-SymbolicName: org.eclipse.papyrus.dev.project.management;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: org.eclipse.papyrus.dev.project.management, + org.eclipse.papyrus.dev.project.management.dialog, + org.eclipse.papyrus.dev.project.management.handlers, + org.eclipse.papyrus.dev.project.management.handlers.features, + org.eclipse.papyrus.dev.project.management.handlers.plugins, + org.eclipse.papyrus.dev.project.management.internal.operations;x-internal:=true, + org.eclipse.papyrus.dev.project.management.utils diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/plugin.xml b/plugins/developer/org.eclipse.papyrus.dev.project.management/plugin.xml index c56c5431a7a..a48f8b8effd 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/plugin.xml +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/plugin.xml @@ -4,24 +4,6 @@ <extension point="org.eclipse.ui.commands"> <command - defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.plugins.ChangePluginVersionHandler" - description="Change Plugin Version" - id="org.eclipse.papyrus.dev.project.management.command.plugin.change.version" - name="Change Plugin Version"> - </command> - <command - defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.features.ChangeFeatureVersionHandler" - description="Change Feature Version" - id="org.eclipse.papyrus.dev.project.management.command.feature.change.version" - name="Change Feature Version"> - </command> - <command - defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.plugins.ChangeDependencyVersionNumberHandler" - description="Change Dependencies Version" - id="org.eclipse.papyrus.dev.project.management.command.plugin.change.dependency.version" - name="Change Dependencies Version"> - </command> - <command defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.plugins.AddProjectAboutFileHandler" id="org.eclipse.papyrus.dev.project.management.command.plugin.add.about" name="Add the file about.html to the project"> @@ -45,9 +27,22 @@ name="Set Feature Copyright"> </command> <command - defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.features.ExternalizeFeatureStringHandler" - id="org.eclipse.papyrus.dev.project.management.command.feature.externalize" - name="Externalize String for Feature"> + defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.plugins.UpdateDependencyRangesHandler" + description="Update bundle/package dependency ranges according to the current PDE target" + id="org.eclipse.papyrus.dev.project.management.command.updateDependencyRanges" + name="Update Dependency Ranges"> + </command> + <command + defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.plugins.OptimizeDependenciesHandler" + description="Optimize bundle dependencies by removing redundancies and adding re-exports to cover the API" + id="org.eclipse.papyrus.dev.project.management.command.optimizeDependencies" + name="Optimize Bundle Dependencies"> + </command> + <command + defaultHandler="org.eclipse.papyrus.dev.project.management.handlers.SyncManifestAndPOMVersions" + description="Ensure that POM versions match their plug-in/feature manifest" + id="org.eclipse.papyrus.dev.project.management.command.syncPOMVersions" + name="Synchronize POM Versions"> </command> </extension> <extension @@ -74,22 +69,11 @@ style="push"> </command> <command - commandId="org.eclipse.papyrus.dev.project.management.command.feature.change.version" - icon="icons/version.png" - label="Change Feature Version (no undo)" - style="push"> - </command> - <command commandId="org.eclipse.papyrus.dev.project.management.command.feature.set.copyright" icon="icons/copyright_icon.png" label="Set Copyright (doesn't erase existing value)" style="push"> </command> - <command - commandId="org.eclipse.papyrus.dev.project.management.command.feature.externalize" - label="Externalize String" - style="push"> - </command> </menu> <menu icon="icons/plugin_obj.gif" @@ -100,21 +84,64 @@ label="Add about.html file (no undo)" style="push"> </command> - <command - commandId="org.eclipse.papyrus.dev.project.management.command.plugin.change.dependency.version" - icon="icons/plugin_mf_obj.gif" - label="Change Dependencies Versions (no undo)" - style="push"> - </command> - <command - commandId="org.eclipse.papyrus.dev.project.management.command.plugin.change.version" - icon="icons/version.png" - label="Change Plugin Version (no undo)" - style="push"> - </command> </menu> + <command + commandId="org.eclipse.papyrus.dev.project.management.command.syncPOMVersions" + icon="icons/version.png" + label="Synchronize POM Versions (no undo)" + style="push"> + </command> </menu> </menuContribution> + <menuContribution + locationURI="popup:org.eclipse.pde.ui.tools?after=additions"> + <command + commandId="org.eclipse.papyrus.dev.project.management.command.updateDependencyRanges" + icon="icons/version.png"> + <visibleWhen + checkEnabled="false"> + <iterate> + <reference + definitionId="org.eclipse.papyrus.dev.project.management.isPluginProjectOrManifest"> + </reference> + </iterate> + </visibleWhen> + </command> + <command + commandId="org.eclipse.papyrus.dev.project.management.command.optimizeDependencies" + icon="icons/plugin_mf_obj.gif"> + <visibleWhen + checkEnabled="false"> + <iterate> + <reference + definitionId="org.eclipse.papyrus.dev.project.management.isPluginProjectOrManifest"> + </reference> + </iterate> + </visibleWhen> + </command> + </menuContribution> </extension> + <extension + point="org.eclipse.core.expressions.definitions"> + <definition + id="org.eclipse.papyrus.dev.project.management.isPluginProjectOrManifest"> + <or> + <adapt + type="org.eclipse.core.resources.IFile"> + <test + property="org.eclipse.core.resources.name" + value="MANIFEST.MF"> + </test> + </adapt> + <adapt + type="org.eclipse.core.resources.IProject"> + <test + property="org.eclipse.core.resources.projectNature" + value="org.eclipse.pde.PluginNature"> + </test> + </adapt> + </or> + </definition> + </extension> </plugin> diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/AbstractChangeProjectVersionHandler.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/AbstractChangeProjectVersionHandler.java deleted file mode 100644 index b55ad7cf452..00000000000 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/AbstractChangeProjectVersionHandler.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.eclipse.papyrus.dev.project.management.handlers; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.IInputValidator; -import org.eclipse.jface.window.Window; -import org.eclipse.osgi.util.NLS; -import org.eclipse.papyrus.dev.project.management.Activator; -import org.eclipse.papyrus.dev.project.management.dialog.InputDialogWithCheckBox; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.ui.progress.IProgressService; -import org.eclipse.ui.statushandlers.StatusManager; - - -public abstract class AbstractChangeProjectVersionHandler extends AbstractHandler { - - private static final String TITLE = "Enter the new version number for Papyrus plugin."; - - private static final String MESSAGE = "Enter the new version number."; - - private static final String INITIAL_VALUE = "0.0.0.qualifier"; - - private static final String CHECKBOX_MESSAGE = "Only projects beginning with 'org.eclipse.papyrus.*'"; - - private static final String WARNING_DIALOG_TITLE = "Change Version Name Report"; - - private static final String WARNING_DIALOG_MESSAGE = "The following project were NOT managed : "; - - private static final String WARNING_DIALOG_MESSAGE2 = "Done."; - - private static final String PAPYRUS_NAME = "org.eclipse.papyrus"; - - - public Object execute(final ExecutionEvent event) throws ExecutionException { - - final IInputValidator validator = new IInputValidator() { - - public String isValid(final String newText) { - final boolean match = newText.matches("[0-9]+\\.[0-9]+\\.[0-9]+\\.qualifier"); - if(!match) { - return NLS.bind("The version number should be : something like this : {0}.", INITIAL_VALUE); - } - return null; - } - }; - - - final InputDialogWithCheckBox dialog = new InputDialogWithCheckBox(Display.getCurrent().getActiveShell(), TITLE, MESSAGE, INITIAL_VALUE, CHECKBOX_MESSAGE, true, validator); - if(dialog.open() == Window.OK) { - WorkspaceModifyOperation workspaceOperation = new WorkspaceModifyOperation(){ - protected void execute(IProgressMonitor monitor) throws CoreException ,InvocationTargetException ,InterruptedException { - IStatus result = runAsJob(dialog.getValue(), dialog.isChecked(), monitor); - StatusManager.getManager().handle(result, StatusManager.SHOW); - } - }; - - try { - IProgressService service = PlatformUI.getWorkbench().getProgressService(); - service.run(true, true, workspaceOperation); - } catch (InvocationTargetException e) { - Activator.log.error(e); - } catch (InterruptedException e) { - Activator.log.error(e); - } - - } - - return null; - } - - protected IStatus runAsJob(final String newVersion, final boolean papyrusProjectsOnly, IProgressMonitor monitor) { - String notManagedProjectNames = ""; - final IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - - monitor.beginTask("Update version numbers", projects.length); - - for(final IProject current : projects) { - - if (monitor.isCanceled()){ - return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, "Operation canceled"); - } - - final String name = current.getName(); - if(papyrusProjectsOnly) { - if(name.startsWith(PAPYRUS_NAME)) {//we test the project name - setVersionNumber(current, newVersion, notManagedProjectNames); - } else { - notManagedProjectNames += NLS.bind("- {0} \n", current.getName()); - } - } else { - setVersionNumber(current, newVersion, notManagedProjectNames); - } - - monitor.worked(1); - } - - if ("".equals(notManagedProjectNames)){ - return Status.OK_STATUS; - } else { - return new Status(IStatus.WARNING, Activator.PLUGIN_ID, WARNING_DIALOG_MESSAGE + "\n" + notManagedProjectNames); - } - - } - - /** - * - * @param project - * the project to manage - * @param newVersion - * the new version for the project - * @param notManagedProjectNames - * a String used to build the message with the not managed projects - */ - protected abstract void setVersionNumber(final IProject project, final String newVersion, String notManagedProjectNames); - - - -} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/SyncManifestAndPOMVersions.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/SyncManifestAndPOMVersions.java new file mode 100644 index 00000000000..8c1a3aa7e19 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/SyncManifestAndPOMVersions.java @@ -0,0 +1,271 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.handlers; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; +import java.nio.CharBuffer; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Result; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.core.runtime.jobs.MultiRule; +import org.eclipse.papyrus.dev.project.management.Activator; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.progress.IProgressService; +import org.eclipse.ui.statushandlers.StatusManager; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Ensures that <tt>pom.xml</tt> files have the same version number as their + * corresponding <tt>MANIFEST.MF</tt> or <tt>feature.xml</tt> file. + */ +public class SyncManifestAndPOMVersions extends AbstractHandler { + private static final Pattern BUNDLE_VERSION = Pattern.compile("^Bundle-Version:\\s*(\\S+)\\s*$", Pattern.MULTILINE); //$NON-NLS-1$ + private static final Pattern POM_FIXUP = Pattern.compile("^(<\\?xml\\s.*?\\?>)\\s*(<project>)\\s*$", Pattern.MULTILINE); + + public SyncManifestAndPOMVersions() { + super(); + } + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + Map<IFile, IFile> pomsByManifest = getAllPOMsByManifest(); + + ISchedulingRule[] rules = Stream.concat( + pomsByManifest.keySet().stream(), + pomsByManifest.values().stream()).toArray(ISchedulingRule[]::new); + MultiRule jobRule = new MultiRule(rules); + + Job updateJob = new Job("Synchronize POM versions") { + + { + setRule(jobRule); + } + + @Override + protected IStatus run(IProgressMonitor monitor) { + SubMonitor sub = SubMonitor.convert(monitor, "Updating POMs...", pomsByManifest.size()); + + pomsByManifest.forEach((manifest, pom) -> { + try { + if (sub.isCanceled()) { + throw new OperationCanceledException(); + } + + String version = getVersion(manifest); + if (version != null) { + version = version.replace(".qualifier", "-SNAPSHOT"); //$NON-NLS-1$//$NON-NLS-2$ + Document xml = slurpXML(pom); + Element versionElement = findVersion(xml); + if (versionElement != null) { + if (!version.equals(versionElement.getTextContent())) { + versionElement.setTextContent(version); + write(xml, pom); + } + } + } + + sub.worked(1); + } catch (CoreException e) { + StatusManager.getManager().handle(e.getStatus(), StatusManager.SHOW); + } + }); + + sub.done(); + + return Status.OK_STATUS; + } + }; + updateJob.schedule(); + + IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event); + IProgressService progress = window.getWorkbench().getProgressService(); + progress.showInDialog(window.getShell(), updateJob); + + return null; + } + + Map<IFile, IFile> getAllPOMsByManifest() { + Map<IFile, IFile> result = new HashMap<>(); + + Stream.of(ResourcesPlugin.getWorkspace().getRoot().getProjects()) + .filter(this::hasPluginOrFeatureNature) + .forEach(project -> { + IFile pom = project.getFile("pom.xml"); //$NON-NLS-1$ + if (pom != null) { + IFile manifest = project.getFile("feature.xml"); + if (!manifest.isAccessible()) { + manifest = project.getFile("META-INF/MANIFEST.MF"); + } + + if (manifest.isAccessible()) { + result.put(manifest, pom); + } + } + }); + + return result; + } + + String slurpText(IFile file) throws CoreException { + StringBuilder result = new StringBuilder(); + CharBuffer buf = CharBuffer.allocate(4096); + + try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getContents(), Charset.forName(file.getCharset())))) { + for (;;) { + if (reader.read(buf) < 0) { + break; // Done + } + buf.flip(); + result.append(buf); + buf.rewind(); + } + } catch (IOException e) { + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to read manifest", e)); + } + + return result.toString(); + } + + Document slurpXML(IFile xmlFile) throws CoreException { + try { + DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + try (InputStream input = xmlFile.getContents()) { + return builder.parse(input); + } + } catch (Exception e) { + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to read manifest file", e)); //$NON-NLS-1$ + } + } + + void write(Document xml, IFile xmlFile) throws CoreException { + try (StringWriter writer = new StringWriter()) { + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + + transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$ + xml.setXmlStandalone(true); + xml.setXmlVersion("1.0"); + + Result result = new StreamResult(writer); + transformer.transform(new DOMSource(xml), result); + String text = writer.toString(); + + // Fix up the transformer's sometime failure to put a newline after the XML declaration + Matcher fixup = POM_FIXUP.matcher(text); + if (fixup.find()) { + StringBuffer fixed = new StringBuffer(text.length() + 2); + fixup.appendReplacement(fixed, fixup.group(1) + '\n' + fixup.group(2)); + fixup.appendTail(fixed); + text = fixed.toString(); + } + + // Write it out + ByteArrayInputStream input = new ByteArrayInputStream(text.getBytes(Charset.forName("UTF-8"))); //$NON-NLS-1$ + xmlFile.setContents(input, false, true, null); + } catch (Exception e) { + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to update POM", e)); + } + } + + String getVersion(IFile manifest) throws CoreException { + String result = null; + + switch (manifest.getName()) { + case "MANIFEST.MF": //$NON-NLS-1$ + String text = slurpText(manifest); + Matcher m = BUNDLE_VERSION.matcher(text); + if (m.find()) { + result = m.group(1); + } + break; + case "feature.xml": //$NON-NLS-1$ + Document xml = slurpXML(manifest); + result = xml.getDocumentElement().getAttribute("version"); //$NON-NLS-1$ + } + + return result; + } + + Element findVersion(Document pom) { + Element project = pom.getDocumentElement(); + return stream(project.getChildNodes()) + .filter(n -> "version".equals(n.getNodeName())) + .filter(Element.class::isInstance).map(Element.class::cast) + .findFirst().orElse(null); + } + + Stream<Node> stream(NodeList nodes) { + Stream.Builder<Node> result = Stream.builder(); + for (int i = 0; i < nodes.getLength(); i++) { + result.add(nodes.item(i)); + } + return result.build(); + } + + boolean hasPluginOrFeatureNature(IProject project) { + boolean result = false; + + if (project.isAccessible()) { + try { + IProjectDescription desc = project.getDescription(); + List<String> natures = Arrays.asList(desc.getNatureIds()); + result = natures.contains("org.eclipse.pde.PluginNature") //$NON-NLS-1$ + || natures.contains("org.eclipse.pde.FeatureNature"); //$NON-NLS-1$ + } catch (CoreException e) { + // Guess it's not an interesting project + Activator.log.log(e.getStatus()); + } + } + + return result; + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/ChangeFeatureVersionHandler.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/ChangeFeatureVersionHandler.java deleted file mode 100644 index f87c81754da..00000000000 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/ChangeFeatureVersionHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.eclipse.papyrus.dev.project.management.handlers.features; - -import java.io.IOException; - -import javax.xml.parsers.ParserConfigurationException; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.osgi.util.NLS; -import org.eclipse.papyrus.dev.project.management.Activator; -import org.eclipse.papyrus.dev.project.management.handlers.AbstractChangeProjectVersionHandler; -import org.eclipse.papyrus.dev.project.management.utils.Utils; -import org.eclipse.papyrus.eclipse.project.editors.interfaces.IFeatureProjectEditor; -import org.eclipse.papyrus.eclipse.project.editors.project.FeatureProjectEditor; -import org.xml.sax.SAXException; - - -public class ChangeFeatureVersionHandler extends AbstractChangeProjectVersionHandler { - - - @Override - protected void setVersionNumber(final IProject project, final String newVersion, String notManagedProjectNames) { - if (project.isOpen()) { - try { - if (project.hasNature(Utils.FEATURE_NATURE)) {// for features - try { - final IFeatureProjectEditor editor = new FeatureProjectEditor(project); - editor.init(); - // This test is necessary to bypass the plugins tagged 0.*.* - if (editor.getVersion().matches("[1-9]+\\.[0-9]+\\.[0-9]+\\.qualifier")) { - editor.setVersion(newVersion); - editor.save(); - } - } catch (final ParserConfigurationException e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } catch (final SAXException e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } catch (final IOException e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } catch (final Throwable e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - - } else { - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - } catch (final CoreException e) { - Activator.log.error(e); - } - } else { - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - } - -} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AbstractManifestUpdateHandler.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AbstractManifestUpdateHandler.java new file mode 100644 index 00000000000..4ff98fe50fc --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AbstractManifestUpdateHandler.java @@ -0,0 +1,140 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.handlers.plugins; + +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.operations.IOperationHistory; +import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.operations.IWorkbenchOperationSupport; +import org.eclipse.ui.progress.IProgressService; + +/** + * Handler for the "update dependency ranges" command, which updates all dependencies + * in the selected <tt.MANIFEST.MF</tt> file(s) to be version ranges lower-bounded + * by the current PDE Target version, except for certain 3rd-party Orbit bundles + * (such as Guava, ICU4J) that are known to increase major versions frequently without + * breaking compatibility. + */ +abstract class AbstractManifestUpdateHandler extends AbstractHandler { + + public AbstractManifestUpdateHandler() { + super(); + } + + protected abstract IUndoableOperation createUpdateOperation(Map<? extends IFile, ? extends IManifestEditor> manifests); + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + List<IFile> manifests = Stream.of(((IStructuredSelection) HandlerUtil.getCurrentSelection(event)).toArray()) + .map(this::getManifestFile) + .filter(Objects::nonNull) + .filter(IResource::isAccessible) + .distinct() + .collect(Collectors.toList()); + + Map<IFile, IManifestEditor> editors = new HashMap<>(); + try { + getEditors(manifests, editors); + } catch (CoreException e) { + throw new ExecutionException("Failed to open manifest(s) for editing", e); + } + + IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event); + IWorkbench workbench = window.getWorkbench(); + IWorkbenchOperationSupport support = workbench.getOperationSupport(); + + IUndoableOperation operation = createUpdateOperation(editors); + IOperationHistory history = support.getOperationHistory(); + operation.addContext(support.getUndoContext()); + + IProgressService progress = workbench.getProgressService(); + + try { + IRunnableWithProgress run = new IRunnableWithProgress() { + + @Override + public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { + try { + history.execute(operation, monitor, null); + + // Save the manifests + for (IManifestEditor next : editors.values()) { + if (next.isDirty()) { + next.save(); + } + } + } catch (ExecutionException e) { + throw new InvocationTargetException(e); + } + + } + }; + + progress.busyCursorWhile(new WorkspaceModifyDelegatingOperation(run)); + } catch (Exception e) { + if (e instanceof InvocationTargetException) { + Throwable wrapped = ((InvocationTargetException) e).getTargetException(); + if (wrapped instanceof ExecutionException) { + throw ((ExecutionException) wrapped); + } + } + throw new ExecutionException("Failed to execute manifest update operation", e); + } + + return null; + } + + private IFile getManifestFile(Object object) { + IFile result = (object instanceof IFile) ? (IFile) object : ((IAdaptable) object).getAdapter(IFile.class); + if (result == null) { + IResource resource = (object instanceof IResource) ? (IResource) object : ((IAdaptable) object).getAdapter(IResource.class); + if (resource != null) { + result = resource.getProject().getFile(new Path("META-INF/MANIFEST.MF")); + } + } + + return result; + } + + private void getEditors(Collection<? extends IFile> manifests, Map<? super IFile, ? super IManifestEditor> editors) throws CoreException { + for (IFile next : manifests) { + editors.put(next, ProjectEditors.getManifestEditor(next.getProject())); + } + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/ChangeDependencyVersionNumberHandler.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/ChangeDependencyVersionNumberHandler.java deleted file mode 100644 index 6b95d1b135c..00000000000 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/ChangeDependencyVersionNumberHandler.java +++ /dev/null @@ -1,257 +0,0 @@ -package org.eclipse.papyrus.dev.project.management.handlers.plugins; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; -import java.lang.reflect.InvocationTargetException; -import java.util.concurrent.atomic.AtomicReference; -import java.util.jar.Manifest; -import java.util.jar.Attributes.Name; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.dialogs.IInputValidator; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.window.Window; -import org.eclipse.osgi.util.NLS; -import org.eclipse.papyrus.dev.project.management.Activator; -import org.eclipse.papyrus.dev.project.management.dialog.TwoInputDialog; -import org.eclipse.papyrus.dev.project.management.utils.Utils; -import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor; -import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; -import org.eclipse.pde.core.project.IBundleProjectDescription; -import org.eclipse.pde.core.project.IBundleProjectService; -import org.eclipse.pde.core.project.IRequiredBundleDescription; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; - -//TODO should be covered with JUnit test -public class ChangeDependencyVersionNumberHandler extends AbstractHandler { - - private static final String TITLE = "Enter the new version number for Papyrus plugin."; - - - private static final String INITIAL_VALUE = "0.0.0"; - - private static final String WARNING_DIALOG_TITLE = "Change Version Name Report"; - - private static final String WARNING_DIALOG_MESSAGE = "The following project were NOT managed : "; - - private static final String WARNING_DIALOG_MESSAGE2 = "Done."; - - private static final String PAPYRUS_NAME = "org.eclipse.papyrus"; - - public Object execute(final ExecutionEvent event) throws ExecutionException { - - final IInputValidator validator = new IInputValidator() { - - public String isValid(final String newText) { - final boolean match = newText.matches("[0-9]+\\.[0-9]+\\.[0-9]"); - if (!match) { - return NLS.bind("The version number should be : something like this : {0}.", INITIAL_VALUE); - } - return null; - } - }; - final TwoInputDialog dialog = new TwoInputDialog(Display.getCurrent().getActiveShell(), TITLE, "Enter the new version for the Papyrus dependencies", "pattern plugin name", INITIAL_VALUE, PAPYRUS_NAME, validator); - - if (dialog.open() == Window.OK) { - final String newVersion = dialog.getValue(); - final String pattern = dialog.getValue_2(); - - Job job = new Job("Update dependency versions") { - - @Override - protected IStatus run(IProgressMonitor monitor) { - - final AtomicReference<IStatus> result = new AtomicReference<IStatus>(); - - WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { - - @Override - protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException { - result.set(runAsJob(newVersion, pattern, monitor)); - } - - }; - - try { - operation.run(monitor); - } catch (InvocationTargetException e) { - return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()); - } catch (InterruptedException e) { - return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()); - } - - return result.get(); - } - - }; - job.setUser(true); - job.schedule(); - } - return null; - } - - protected IStatus runAsJob(final String newVersion, final String pattern, IProgressMonitor monitor) { - String notManagedProjectNames = ""; - - final IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - - monitor.beginTask("Update dependency versions", projects.length); - - for (final IProject current : projects) { - final String name = current.getName(); - - if (name.startsWith(PAPYRUS_NAME)) {// TODO : add the possibility to manage other plugins - setVersionNumber(current, pattern, newVersion, notManagedProjectNames); - } else { - notManagedProjectNames += NLS.bind("- {0} \n", current.getName()); - } - - monitor.worked(1); - } - - - final String textResult = notManagedProjectNames; - Display.getDefault().asyncExec(new Runnable() { - - public void run() { - if (textResult.equals("")) { - final MessageDialog informationDialog = new MessageDialog(Display.getCurrent().getActiveShell(), WARNING_DIALOG_TITLE, null, WARNING_DIALOG_MESSAGE2, MessageDialog.INFORMATION, new String[] { "OK" }, 0); - informationDialog.open(); - } else { - final MessageDialog informationDialog = new MessageDialog(Display.getCurrent().getActiveShell(), WARNING_DIALOG_TITLE, null, WARNING_DIALOG_MESSAGE + "\n" + textResult, MessageDialog.INFORMATION, new String[] { "OK" }, 0); - informationDialog.open(); - } - } - }); - - return Status.OK_STATUS; - } - - /** - * - * @param project - * the project to manage - * @param dependencyPattern - * the pattern used to find the dependency to update - * @param newVersion - * the new version for the project - * @param notManagedProjectNames - * a String used to build the message with the not managed projects - */ - private void setVersionNumber(final IProject project, final String dependencyPattern, final String newValue, String notManagedProjectNames) { - if (project.isOpen()) { - try { - final boolean pluginnature = project.hasNature(Utils.PLUGIN_NATURE); - if (pluginnature) { - try { - MyManifestEditor editor = new MyManifestEditor(project); - editor.init(); - editor.setDependenciesVersion(dependencyPattern, newValue); - editor.save(); - } catch (final IOException e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } catch (final Throwable e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - - } - } catch (final CoreException e) { - Activator.log.error(e); - } - } else { - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - } - - - private class MyManifestEditor extends ManifestEditor { - - private static final String SEMICOLON = ";"; //$NON-NLS-1$ - - private static final String COMMA = ","; //$NON-NLS-1$ - - private static final String ASSIGN = "="; //$NON-NLS-1$ - - private static final String BUNDLE_VERSION = "bundle-version"; //$NON-NLS-1$ - - private static final String REQUIRED_BUNDLE = "Require-Bundle"; //$NON-NLS-1$ - - private Manifest manifest; - - private IFile manifestFile; - - /** - * Constructor. - * - * @param project - * @throws IOException - * @throws CoreException - */ - public MyManifestEditor(IProject project) throws IOException, CoreException { - super(project); - manifestFile = project.getFile("META-INF/MANIFEST.MF"); - manifest = new Manifest(manifestFile.getContents()); - } - - /** - * @see org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor#setDependenciesVersion(java.lang.String, java.lang.String) - * - * @param dependencyPattern - * @param newVersion - */ - @Override - public void setDependenciesVersion(String dependencyPattern, String newVersion) { - final Name rqBundle = new Name(REQUIRED_BUNDLE); - final String requireBundles = manifest.getMainAttributes().getValue(rqBundle); - final String[] bundles = requireBundles.split(COMMA); - String newRequiredBundles = ""; //$NON-NLS-1$ - for (int ii = 0; ii < bundles.length; ii++) {// we iterate on the declared dependencies - final String currentDependency = bundles[ii]; - final String[] dependencyValue = currentDependency.split(SEMICOLON); - if (dependencyValue[0].contains(dependencyPattern)) { - String[] test = dependencyValue[1].split("[0-9]+\\.[0-9]+\\.[0-9]"); - String oldVersion = dependencyValue[1].substring(test[0].length(), test[0].length() + 5); - // This test is necessary to take into account the versions tagged 0.*.* - String newBundleVersion = BUNDLE_VERSION + ASSIGN + '"' + newVersion + '"'; - if (!oldVersion.matches("[1-9]+\\.[0-9]+\\.[0-9]")) { - newBundleVersion = BUNDLE_VERSION + ASSIGN + '"' + oldVersion + '"'; - } - newRequiredBundles += dependencyValue[0] + SEMICOLON + newBundleVersion; - for (int i = 1; i < dependencyValue.length; i++) { - final String declaration = dependencyValue[i]; - if (declaration.contains(BUNDLE_VERSION + ASSIGN)) { - // we ignore it - } else { - newRequiredBundles += SEMICOLON + dependencyValue[i];// we add the others declaration - } - } - } else { - newRequiredBundles += currentDependency;// we copy the existing declaration - } - if (ii < (bundles.length - 1)) { - newRequiredBundles += COMMA; - } - } - setValue(REQUIRED_BUNDLE, newRequiredBundles); - } - } - -} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/ChangePluginVersionHandler.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/ChangePluginVersionHandler.java deleted file mode 100644 index 223fa7a30f1..00000000000 --- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/ChangePluginVersionHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.eclipse.papyrus.dev.project.management.handlers.plugins; - -import java.io.IOException; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.osgi.util.NLS; -import org.eclipse.papyrus.dev.project.management.Activator; -import org.eclipse.papyrus.dev.project.management.handlers.AbstractChangeProjectVersionHandler; -import org.eclipse.papyrus.dev.project.management.utils.Utils; -import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor; -import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; - - -public class ChangePluginVersionHandler extends AbstractChangeProjectVersionHandler { - - - @Override - protected void setVersionNumber(final IProject project, final String newVersion, String notManagedProjectNames) { - if (project.isOpen()) { - try { - if (project.hasNature(Utils.PLUGIN_NATURE)) { - try { - final IManifestEditor editor = new ManifestEditor(project); - editor.init(); - // This test is necessary to bypass the plugins tagged 0.*.* - if (editor.getBundleVersion().matches("[1-9]+\\.[0-9]+\\.[0-9]+\\.qualifier")) { - editor.setBundleVersion(newVersion); - editor.save(); - } - } catch (final IOException e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } catch (final Throwable e) { - Activator.log.error(e); - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - - } else { - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - } catch (final CoreException e) { - Activator.log.error(e); - } - } else { - notManagedProjectNames += NLS.bind("- {0} \n", project.getName()); - } - } - -} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OptimizeDependenciesHandler.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OptimizeDependenciesHandler.java new file mode 100644 index 00000000000..d9a501e25ea --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OptimizeDependenciesHandler.java @@ -0,0 +1,38 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.handlers.plugins; + +import java.util.Map; + +import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.resources.IFile; +import org.eclipse.papyrus.dev.project.management.internal.operations.OptimizeDependenciesOperation; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; + +/** + * Handler for the "optimize dependencies" command, which ensures re-exports of dependencies + * that contribute types to the exported API and removes redundancies (except where they are + * re-exported). + */ +public class OptimizeDependenciesHandler extends AbstractManifestUpdateHandler { + + public OptimizeDependenciesHandler() { + super(); + } + + @Override + protected IUndoableOperation createUpdateOperation(Map<? extends IFile, ? extends IManifestEditor> manifests) { + return new OptimizeDependenciesOperation(manifests); + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/UpdateDependencyRangesHandler.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/UpdateDependencyRangesHandler.java new file mode 100644 index 00000000000..048ef1cc953 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/UpdateDependencyRangesHandler.java @@ -0,0 +1,40 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.handlers.plugins; + +import java.util.Map; + +import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.resources.IFile; +import org.eclipse.papyrus.dev.project.management.internal.operations.UpdateDependencyRangesOperation; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; + +/** + * Handler for the "update dependency ranges" command, which updates all dependencies + * in the selected <tt.MANIFEST.MF</tt> file(s) to be version ranges lower-bounded + * by the current PDE Target version, except for certain 3rd-party Orbit bundles + * (such as Guava, ICU4J) that are known to increase major versions frequently without + * breaking compatibility. + */ +public class UpdateDependencyRangesHandler extends AbstractManifestUpdateHandler { + + public UpdateDependencyRangesHandler() { + super(); + } + + @Override + protected IUndoableOperation createUpdateOperation(Map<? extends IFile, ? extends IManifestEditor> manifests) { + return new UpdateDependencyRangesOperation(manifests); + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/AbstractManifestUpdateOperation.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/AbstractManifestUpdateOperation.java new file mode 100644 index 00000000000..a1252300016 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/AbstractManifestUpdateOperation.java @@ -0,0 +1,68 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.internal.operations; + +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.operations.AbstractOperation; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; + +abstract class AbstractManifestUpdateOperation extends AbstractOperation { + + private Map<? extends IFile, ? extends IManifestEditor> manifests; + + public AbstractManifestUpdateOperation(String label, Map<? extends IFile, ? extends IManifestEditor> manifests) { + super(label); + + this.manifests = manifests; + } + + @Override + public final IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { + try { + return doExecute(monitor, manifests); + } finally { + // Don't need these any longer + manifests = null; + } + } + + protected abstract IStatus doExecute(IProgressMonitor monitor, Map<? extends IFile, ? extends IManifestEditor> manifests) throws ExecutionException; + + @Override + public boolean canUndo() { + return false; + } + + @Override + public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { + return Status.CANCEL_STATUS; + } + + @Override + public boolean canRedo() { + return false; + } + + @Override + public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { + return Status.CANCEL_STATUS; + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyAnalysisContext.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyAnalysisContext.java new file mode 100644 index 00000000000..d268b650432 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyAnalysisContext.java @@ -0,0 +1,705 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.internal.operations; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.osgi.service.resolver.BundleDescription; +import org.eclipse.osgi.service.resolver.BundleSpecification; +import org.eclipse.osgi.service.resolver.ExportPackageDescription; +import org.eclipse.pde.core.plugin.IPluginModelBase; +import org.eclipse.pde.core.plugin.PluginRegistry; +import org.osgi.framework.VersionRange; + +/** + * A context in which bundle dependency analysis is computed. It maintains + * shared state for analysis of the dependencies of any number of bundles + * in the workspace and PDE target. + */ +public class DependencyAnalysisContext { + + private final Map<String, BundleAnalysis> bundles = new HashMap<>(); + private final Map<String, BundleAnalysis> packageProviders = new HashMap<>(); + + private final VersionRules versionRules = new VersionRules(); + + private final Deque<SubMonitor> monitorStack = new LinkedList<SubMonitor>(); + private SubMonitor currentMonitor; + + private final Set<BundleAnalysis> roots; + + public DependencyAnalysisContext(Collection<? extends IFile> bundleManifests) { + super(); + + pushMonitor(new NullProgressMonitor()); + + roots = Collections.unmodifiableSet(init(bundleManifests)); + } + + private Set<BundleAnalysis> init(Collection<? extends IFile> bundleManifests) { + return bundleManifests.stream() + .map(this::getBundleID) + .filter(Objects::nonNull) + .map(this::internalGetBundle) + .map(BundleAnalysis::checkCycle) // Bombs the analysis if there's any dependency cycle + .collect(Collectors.toSet()); + } + + private String getBundleID(IFile manifest) { + IPluginModelBase model = PluginRegistry.findModel(manifest.getProject()); + return (model == null) ? null : model.getPluginBase().getId(); + } + + public Set<BundleAnalysis> getAnalysisRoots() { + return roots; + } + + public boolean isAnalysisRoot(String bundleID) { + return roots.contains(internalGetBundle(bundleID)); + } + + public BundleAnalysis getBundle(String bundleID) { + return internalGetBundle(bundleID).analyze(); + } + + private BundleAnalysis internalGetBundle(String bundleID) { + return bundles.computeIfAbsent(bundleID, BundleAnalysis::new); + } + + public BundleAnalysis getProvidingBundle(String packageName) { + return packageProviders.computeIfAbsent(packageName, this::findPackageProvider); + } + + private BundleAnalysis findPackageProvider(String packageName) { + // Protect against concurrent modification + return new ArrayList<>(bundles.values()).stream() + .map(BundleAnalysis::getAPIExports) + .filter(api -> api.exports(packageName)) + .findAny().map(APIExports::getBundle).orElse(null); + } + + public final void pushMonitor(IProgressMonitor monitor) { + currentMonitor = (monitor instanceof SubMonitor) ? (SubMonitor) monitor : SubMonitor.convert(monitor); + monitorStack.push(currentMonitor); + } + + public final void popMonitor() { + monitorStack.pop(); + currentMonitor = monitorStack.peek(); + } + + // + // Nested types + // + + /** + * An analysis of the transitive dependencies (by <tt>Require-Bundle</tt>) and public + * API exports of a bundle. Bundles sort dependencies before dependents. + */ + public class BundleAnalysis { + private final String bundleID; + + private DependencyGraph dependencyGraph; + private APIExports apiExports; + + private BundleAnalysis(String bundleID) { + super(); + + this.bundleID = bundleID; + } + + public String getBundleID() { + return bundleID; + } + + public BundleAnalysis checkCycle() throws IllegalStateException { + getDependencyGraph().checkCycle(); + return this; + } + + public VersionRange getCompatibleVersionRange() { + return getAPIExports().getCompatibleVersionRange(); + } + + public DependencyGraph getDependencyGraph() { + analyze(); + return dependencyGraph; + } + + public APIExports getAPIExports() { + analyze(); + return apiExports; + } + + public BundleAnalysis getDependency(String bundleID) { + return getDependencyGraph().getDependency(bundleID); + } + + public boolean isReexported(String bundleID) { + return getDependencyGraph().isReexported(bundleID); + } + + /** + * Queries whether I express a dependency directly on the given bundle. + * Equivalent to {@link #hasDependency(String, boolean) hasDependency(bundleID, false)}. + * + * @param bundleID + * a bundle identifier + * @return whether my bundle directly requires it + */ + public boolean hasDependency(String bundleID) { + return getDependencyGraph().hasDependency(bundleID); + } + + /** + * Queries whether I express a dependency directly or, optionally, + * indirectly on the given bundle. + * + * @param bundleID + * a bundle identifier + * @param recursive + * whether to consider transitive (indirect) dependencies + * + * @return whether my bundle directly requires it + */ + public boolean hasDependency(String bundleID, boolean recursive) { + return getDependencyGraph().hasDependency(bundleID, recursive); + } + + /** + * Obtains the set of bundles that should be re-exported that are not + * explicitly required (they mmust be implicitly required because some + * other dependency re-exports them). + * + * @return the missing re-exported dependency declarations + */ + public Set<BundleAnalysis> getMissingReexports() { + return getAPIExports().getMissingReexports(); + } + + private BundleAnalysis analyze() { + if (dependencyGraph == null) { + dependencyGraph = new DependencyGraph(bundleID); + } + if (apiExports == null) { + apiExports = new APIExports(bundleID); + } + + return this; + } + + public String toReexportDeclaration() { + return String.format("%s;bundle-version=\"%s\";visibility:=reexport", + getBundleID(), + getCompatibleVersionRange()); + } + + /** + * For bundles that are workspace projects, gets the manifest file. + * + * @return the workspace bundle's manifest, or {@code null} if I am + * a target bundle + */ + public IFile getManifest() { + IFile result = null; + + IPluginModelBase model = PluginRegistry.findModel(getBundleID()); + IResource resource = (model == null) ? null : model.getUnderlyingResource(); + if (resource != null) { + switch (resource.getType()) { + case IResource.FILE: + if ("MANIFEST.MF".equals(resource.getName())) { + result = (IFile) resource; + } + break; + case IResource.PROJECT: + IFile manifest = ((IProject) resource).getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$ + if ((manifest != null) && manifest.isAccessible()) { + result = manifest; + } + break; + } + } + + return result; + } + + /** + * Queries whether I am an analysis root, which is a bundle selected + * by the user for optimization. + * + * @return whether I am an analysis root + */ + public boolean isAnalysisRoot() { + return DependencyAnalysisContext.this.isAnalysisRoot(getBundleID()); + } + + /** + * A partial-ordering analoque of the {@link Comparable#compareTo(Object)} API. + * Bundles are only partially orderable by dependency relationships, so + * they are not actually {@link Comparable}. + * + * @param o + * another analysis bundle + * + * @return my partial ordering relative to {@code o} + */ + public int partialCompare(BundleAnalysis o) { + int result; + + if (o == this) { + // Trivial case + result = 0; + } else if (this.hasDependency(o.getBundleID(), true)) { + result = +1; + } else if (o.hasDependency(this.getBundleID(), true)) { + result = -1; + } else { + result = 0; + } + + return result; + } + + @Override + public String toString() { + return "Analysis of " + bundleID; + } + + public final void pushMonitor(IProgressMonitor monitor) { + DependencyAnalysisContext.this.pushMonitor(monitor); + } + + public final void popMonitor() { + DependencyAnalysisContext.this.popMonitor(); + } + } + + /** + * An analysis of the dependency graph (by <tt>Require-Bundle</tt>) of a bundle. + */ + public class DependencyGraph { + private final String bundleID; + + private final Map<String, BundleAnalysis> dependencies = new HashMap<>(); + private final Map<String, BundleAnalysis> reexports = new HashMap<>(); + + private Set<BundleAnalysis> cycle; + private Set<String> transitiveDependencies; + + private DependencyGraph(String bundleID) { + super(); + + this.bundleID = bundleID; + + IPluginModelBase model = PluginRegistry.findModel(bundleID); + if (model == null) { + throw new IllegalArgumentException("No such bundle: " + bundleID); + } + + BundleDescription desc = model.getBundleDescription(); + + if (desc != null) { + for (BundleSpecification next : desc.getRequiredBundles()) { + // Optional dependencies may as well not be defined. If they are + // exposed by the API, they cannot be optional + + if (next.isResolved() && !next.isOptional() + // The org.eclipse.utp.upr bundle actually does this! + && !bundleID.equals(next.getName())) { + BundleAnalysis dep = internalGetBundle(next.getSupplier().getName()); + + dependencies.put(dep.getBundleID(), dep); + if (next.isExported()) { + reexports.put(dep.getBundleID(), dep); + } + } + } + } + } + + public BundleAnalysis getBundle() { + return internalGetBundle(bundleID); + } + + public BundleAnalysis getDependency(String bundleID) { + BundleAnalysis result = dependencies.get(bundleID); + + if (result == null) { + // Maybe it's a transitive dependency + result = dependencies.values().stream() + .map(bundle -> bundle.getDependency(bundleID)) + .filter(Objects::nonNull) + .findAny().orElse(null); + } + + return result; + } + + public boolean isReexported(String bundleID) { + // I trivially "re-export" myself + boolean result = this.bundleID.equals(bundleID) || reexports.containsKey(bundleID); + + if (!result) { + // Maybe it's a transitive re-export + result = reexports.values().stream() + .anyMatch(bundle -> bundle.isReexported(bundleID)); + } + + return result; + } + + /** + * Queries whether I express a dependency directly on the given bundle. + * Equivalent to {@link #hasDependency(String, boolean) hasDependency(bundleID, false)}. + * + * @param bundleID + * a bundle identifier + * @return whether my bundle directly requires it + */ + public boolean hasDependency(String bundleID) { + return dependencies.containsKey(bundleID); + } + + /** + * Queries whether I express a dependency directly or, optionally, + * indirectly on the given bundle. + * + * @param bundleID + * a bundle identifier + * @param recursive + * whether to consider transitive (indirect) dependencies + * + * @return whether my bundle directly requires it + */ + public boolean hasDependency(String bundleID, boolean recursive) { + boolean result = hasDependency(bundleID); + + if (!result && recursive) { + result = transitiveDependencies.contains(bundleID); + } + + return result; + } + + public boolean isRedundant(String bundleID) { + boolean result; + + if (isReexported(bundleID)) { + // If it's re-exported, then it's only redundant if it is also re-exported + // by some other bundle that I re-export. Account for re-exports that we + // would be adding + result = Stream.concat(reexports.values().stream(), getBundle().getMissingReexports().stream()) + .filter(bundle -> !bundleID.equals(bundle.getBundleID())) // Excluding the bundle itself, of course! + .anyMatch(bundle -> bundle.isReexported(bundleID)); + } else { + // Otherwise, it's redundant if it's re-exported by any of our dependencies + result = dependencies.values().stream() + .filter(bundle -> !bundle.getBundleID().equals(bundleID)) + .anyMatch(bundle -> bundle.isReexported(bundleID)); + } + + return result; + } + + public void checkCycle() throws IllegalStateException { + if (cycle == null) { + cycle = computeCycle(new LinkedHashSet<>()); + } + + if (!cycle.isEmpty()) { + List<String> list = cycle.stream() + .map(BundleAnalysis::getBundleID) + .collect(Collectors.toList()); + list.add(cycle.iterator().next().getBundleID()); // Close the cycle + throw new IllegalStateException("Dependency cycle detected: " + list); + } + } + + // use a LinkedHashSet specifically because the cycle has a defined order + private Set<BundleAnalysis> computeCycle(LinkedHashSet<BundleAnalysis> trace) { + if (cycle != null) { + // I've already been validated, so there's no possibility of finding + // a new cycle in me + return cycle; + } + + BundleAnalysis self = getBundle(); + + if (!trace.add(self)) { + // We closed the cycle. Trim up to the first occurrence of myself + for (Iterator<BundleAnalysis> iter = trace.iterator(); iter.hasNext();) { + if (iter.next() == self) { + break; + } else { + iter.remove(); + } + } + cycle = trace; + } else { + // Take this opportunity when we are exhaustively looking for a cycle, anyways, + // to compute everybody's transitive dependencies + transitiveDependencies = new HashSet<>(); + + // We didn't close the cycle, so keep looking + for (BundleAnalysis next : dependencies.values()) { + DependencyGraph child = next.getDependencyGraph(); + cycle = child.computeCycle(trace); + if (!cycle.isEmpty()) { + // Got a cycle + break; + } else { + // Collect its dependencies and its transitive dependencies + transitiveDependencies.addAll(child.dependencies.keySet()); + transitiveDependencies.addAll(child.transitiveDependencies); + } + } + + // Cycle could be null if I had no dependencies + if ((cycle == null) || cycle.isEmpty()) { + // Some of my direct dependencies could be dependencies of some of + // my transitive dependencies, but they are direct to me + transitiveDependencies.removeAll(dependencies.keySet()); + + // Backtrack + trace.remove(self); + + // And mark me cycle-free + cycle = Collections.emptySet(); + } + } + + return cycle; + } + + public void removeDependency(String bundleID) { + dependencies.remove(bundleID); + + // It's now just a transitive dependency because it was redundant + transitiveDependencies.add(bundleID); + + // And it obviously can't be reexported + reexports.remove(bundleID); + } + + public void reexport(String bundleID) { + reexports.put(bundleID, internalGetBundle(bundleID)); + + // This information is now stale + getBundle().getAPIExports().recomputeMissingReexports(); + } + + @Override + public String toString() { + return "Dependencies of " + bundleID; + } + } + + /** + * An analysis of the public API exports of a bundle. + */ + public class APIExports { + private final String bundleID; + private VersionRange compatibleVersionRange; + + private Set<String> exports; + private Map<String, BundleAnalysis> exposedDependencies; + private Set<BundleAnalysis> missingReexports; + + private APIExports(String bundleID) { + super(); + + this.bundleID = bundleID; + } + + public BundleAnalysis getBundle() { + return internalGetBundle(bundleID); + } + + public VersionRange getCompatibleVersionRange() { + return compatibleVersionRange; + } + + public boolean exports(String packageName) { + analyze(); + + return exports.contains(packageName); + } + + public boolean isExposed(String bundleID) { + analyze(); + + return exposedDependencies.containsKey(bundleID); + } + + public Set<BundleAnalysis> getExposedDependencies() { + analyze(); + + return new HashSet<>(exposedDependencies.values()); + } + + /** + * Obtains the set of bundles that should be re-exported that are not + * explicitly required (they mmust be implicitly required because some + * other dependency re-exports them). + * + * @return the missing re-exported dependency declarations + */ + public Set<BundleAnalysis> getMissingReexports() { + if (missingReexports == null) { + missingReexports = getExposedDependencies().stream() + .filter(bundle -> !getBundle().isReexported(bundle.getBundleID())) + .filter(bundle -> !getBundle().hasDependency(bundle.getBundleID())) + .filter(bundle -> !isReexportedByExposedDependency(bundle)) + .collect(Collectors.toCollection( + () -> new TreeSet<>(Comparator.comparing(BundleAnalysis::getBundleID)))); + } + + return missingReexports; + } + + void recomputeMissingReexports() { + missingReexports = null; + } + + private APIExports analyze() { + if (exposedDependencies == null) { + exposedDependencies = new HashMap<>(); + + IPluginModelBase model = PluginRegistry.findModel(bundleID); + BundleDescription desc = model.getBundleDescription(); + IProject project = (model.getUnderlyingResource() == null) + ? null + : model.getUnderlyingResource().getProject(); + BundleAnalysis self = getBundle(); + + if (desc == null) { + // No exports if no bundle description + exports = Collections.emptySet(); + compatibleVersionRange = VersionRange.valueOf("0.0.0"); //$NON-NLS-1$ + } else { + compatibleVersionRange = versionRules.getDependencyVersionRange( + DependencyKind.REQUIRE_BUNDLE, bundleID); + + if ((project == null) || !isAnalysisRoot(bundleID)) { + // It's a PDE target bundle. We don't need to compute uses constraints + // for it because we won't be attempting to edit its dependencies + exports = Stream.of(desc.getExportPackages()) + .filter(this::isPublicExport) + .map(ExportPackageDescription::getName) + .collect(Collectors.toSet()); + } else { + // It's a workspace bundle that is selected for optimization. + // We need to compute uses constraints for it + Map<String, ? extends Set<String>> uses = new MyCalculateUsesOperation(project, model).calculate(); + + currentMonitor.setTaskName("Computing re-exported dependencies..."); + exports = new HashSet<>(uses.keySet()); + Set<String> allUsedPackages = uses.values().stream() + .flatMap(Collection::stream) + .distinct() + .collect(Collectors.toSet()); + + // Don't consider my own exported packages, of course + allUsedPackages.removeAll(exports); + + for (String next : allUsedPackages) { + BundleAnalysis provider = getProvidingBundle(next); + if ((provider != null) && (provider != self) && !exposedDependencies.containsKey(provider.getBundleID())) { + exposedDependencies.put(provider.getBundleID(), provider); + } + } + } + } + + exports.forEach(x -> packageProviders.put(x, self)); + } + + return this; + } + + private boolean isPublicExport(ExportPackageDescription exportPackage) { + Map<String, String> directives = exportPackage.getDeclaredDirectives(); + return !"true".equals(directives.get("x-internal")) + && !directives.containsKey("x-friends"); + } + + /** + * Queries whether a {@code bundle} is re-exported by some existing dependency + * that is exposed in the API. Such a bundle would not have to be added as + * a missing re-export. + * + * @param bundle + * an exposed bundle + * + * @return whether it is re-exported by some other bundle that I expose + */ + private boolean isReexportedByExposedDependency(BundleAnalysis bundle) { + return exposedDependencies.values().stream() + .anyMatch(dep -> dep.isReexported(bundle.getBundleID())); + } + + @Override + public String toString() { + return "API of " + bundleID; + } + + // + // Nested types + // + + @SuppressWarnings("restriction") + private final class MyCalculateUsesOperation extends org.eclipse.pde.internal.ui.search.dependencies.CalculateUsesOperation { + MyCalculateUsesOperation(IProject project, IPluginModelBase model) { + // This cast is safe if the model if the model is a workspace bundle project + super(project, (org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase) model); + } + + Map<String, ? extends Set<String>> calculate() { + Map<String, ? extends Set<String>> result; + + Collection<String> packages = getPublicExportedPackages(); + if (packages.isEmpty()) { + result = Collections.emptyMap(); + } else { + result = findPackageReferences(packages, currentMonitor.split(1)); // Split doesn't matter for unknown total work + } + + return result; + } + } + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyKind.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyKind.java new file mode 100644 index 00000000000..b391273474b --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyKind.java @@ -0,0 +1,81 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.internal.operations; + +import java.util.List; +import java.util.function.Function; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; +import org.eclipse.pde.core.project.IPackageImportDescription; +import org.eclipse.pde.core.project.IRequiredBundleDescription; +import org.osgi.framework.VersionRange; + +public enum DependencyKind { + /** A <tt>Require-Bundle</tt> type of dependency. */ + REQUIRE_BUNDLE(IRequiredBundleDescription.class, IManifestEditor::getRequiredBundles, IRequiredBundleDescription::getName, IManifestEditor::addDependency), + + /** An <tt>Import-Package</tt> type of dependency. */ + IMPORT_PACKAGE(IPackageImportDescription.class, IManifestEditor::getImportedPackages, IPackageImportDescription::getName, IManifestEditor::addImportPackage); + + private final Function<IManifestEditor, List<?>> dependenciesFunction; + + private final Function<?, String> dependencyNameFunction; + + private final DependencyUpdater dependencyUpdater; + + private <T> DependencyKind(Class<T> dependencyType, Function<IManifestEditor, List<?>> dependenciesFunction, Function<T, String> dependencyNameFunction, DependencyUpdater dependencyUpdater) { + this.dependenciesFunction = dependenciesFunction; + this.dependencyNameFunction = dependencyNameFunction; + this.dependencyUpdater = dependencyUpdater; + } + + String getVersionAttribute() { + return (this == REQUIRE_BUNDLE) + ? "bundle-version" //$NON-NLS-1$ + : "version"; //$NON-NLS-1$ + } + + static DependencyKind forHeader(String headerName) { + switch (headerName) { + case "Require-Bundle": + return REQUIRE_BUNDLE; + case "Import-Package": + return IMPORT_PACKAGE; + default: + throw new IllegalArgumentException(headerName); + } + } + + public List<?> getDependencies(IManifestEditor manifest) { + return dependenciesFunction.apply(manifest); + } + + @SuppressWarnings("unchecked") + public String getDependencyName(Object dependency) { + return ((Function<Object, String>) dependencyNameFunction).apply(dependency); + } + + public void setDependencyRange(IManifestEditor manifest, String dependencyName, VersionRange range) { + dependencyUpdater.setDependencyRange(manifest, dependencyName, range.toString()); + } + + // + // Nested types + // + + @FunctionalInterface + private interface DependencyUpdater { + void setDependencyRange(IManifestEditor manifest, String dependencyName, String versionRange); + } +}
\ No newline at end of file diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/OptimizeDependenciesOperation.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/OptimizeDependenciesOperation.java new file mode 100644 index 00000000000..87aed84f133 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/OptimizeDependenciesOperation.java @@ -0,0 +1,104 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.internal.operations; + +import java.util.List; +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.papyrus.dev.project.management.internal.operations.DependencyAnalysisContext.APIExports; +import org.eclipse.papyrus.dev.project.management.internal.operations.DependencyAnalysisContext.BundleAnalysis; +import org.eclipse.papyrus.dev.project.management.internal.operations.DependencyAnalysisContext.DependencyGraph; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; +import org.eclipse.papyrus.infra.tools.util.Iterables2; +import org.eclipse.pde.core.project.IRequiredBundleDescription; + +/** + * Undoable "optimize dependencies" operation, which ensures re-exports of dependencies + * that contribute types to the exported API and removes redundancies (except where they are + * re-exported). + */ +public class OptimizeDependenciesOperation extends AbstractManifestUpdateOperation { + + public OptimizeDependenciesOperation(Map<? extends IFile, ? extends IManifestEditor> manifests) { + super("Optimize Bundle Dependencies", manifests); + } + + @Override + protected IStatus doExecute(IProgressMonitor monitor, Map<? extends IFile, ? extends IManifestEditor> manifests) throws ExecutionException { + SubMonitor sub = SubMonitor.convert(monitor, "Analyzing ...", manifests.size() + 1); + + sub.split(1).beginTask("Initializing", IProgressMonitor.UNKNOWN); + + DependencyAnalysisContext analysisContext = new DependencyAnalysisContext(manifests.keySet()); + + // This map is sorted from root to leaves of the dependency tree + List<BundleAnalysis> bundles = Iterables2.topoSort( + analysisContext.getAnalysisRoots(), + BundleAnalysis::partialCompare); + + for (BundleAnalysis bundle : bundles) { + IManifestEditor editor = manifests.get(bundle.getManifest()); + + SubMonitor step = sub.split(1); + + if (step.isCanceled()) { + throw new OperationCanceledException(); + } + + editor.init(); + optimizeDependencies(bundle, editor, step); + } + + return Status.OK_STATUS; + } + + private void optimizeDependencies(BundleAnalysis bundle, IManifestEditor manifest, IProgressMonitor monitor) { + monitor.beginTask(bundle.getBundleID(), IProgressMonitor.UNKNOWN); + bundle.pushMonitor(monitor); + + try { + DependencyGraph graph = bundle.getDependencyGraph(); + APIExports api = bundle.getAPIExports(); + + for (IRequiredBundleDescription requireBundle : manifest.getRequiredBundles()) { + String required = requireBundle.getName(); + + if (graph.isRedundant(required)) { + // Remove it from the manifest + manifest.removeRequiredBundle(required); + + // Update the graph + graph.removeDependency(required); + } else if (api.isExposed(required) && !requireBundle.isExported()) { + // We need to retain this dependency and ensure that it is re-exported, + // unless it is already re-exported by some other dependency that we re-export + // (which would be the redundant case, above) + manifest.setRequiredBundleExported(required, true); + + // Update the graph + graph.reexport(required); + } // else just retain this dependency as is + } + } finally { + bundle.popMonitor(); + } + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/UpdateDependencyRangesOperation.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/UpdateDependencyRangesOperation.java new file mode 100644 index 00000000000..4a87f700b2a --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/UpdateDependencyRangesOperation.java @@ -0,0 +1,81 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.internal.operations; + +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; +import org.osgi.framework.VersionRange; + +/** + * Undoable "update dependency ranges" operation, which updates all dependencies + * in the selected <tt.MANIFEST.MF</tt> file(s) to be version ranges lower-bounded + * by the current PDE Target version, except for certain 3rd-party Orbit bundles + * (such as Guava, ICU4J) that are known to increase major versions frequently without + * breaking compatibility. + */ +public class UpdateDependencyRangesOperation extends AbstractManifestUpdateOperation { + + private final VersionRules versionRules = new VersionRules(); + + public UpdateDependencyRangesOperation(Map<? extends IFile, ? extends IManifestEditor> manifests) { + super("Update Dependency Ranges", manifests); + } + + @Override + protected IStatus doExecute(IProgressMonitor monitor, Map<? extends IFile, ? extends IManifestEditor> manifests) throws ExecutionException { + SubMonitor sub = SubMonitor.convert(monitor, "Updating manifests...", manifests.size() * 2); + + for (IManifestEditor editor : manifests.values()) { + if (sub.isCanceled()) { + throw new OperationCanceledException(); + } + + editor.init(); + + updateDependencies(editor, DependencyKind.REQUIRE_BUNDLE); + sub.worked(1); + + if (sub.isCanceled()) { + throw new OperationCanceledException(); + } + + updateDependencies(editor, DependencyKind.IMPORT_PACKAGE); + sub.worked(1); + } + + sub.done(); + + return Status.OK_STATUS; + } + + private void updateDependencies(IManifestEditor manifest, DependencyKind kind) { + // The API interfaces for dependencies have no common supertype + for (Object dependency : kind.getDependencies(manifest)) { + String dependencyName = kind.getDependencyName(dependency); + + VersionRange range = versionRules.getDependencyVersionRange(kind, dependencyName); + if (range != null) { + kind.setDependencyRange(manifest, dependencyName, range); + } // else this bundle needs no update + } + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java new file mode 100644 index 00000000000..cf700faecae --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java @@ -0,0 +1,221 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.dev.project.management.internal.operations; + +import java.util.Objects; +import java.util.function.BiFunction; +import java.util.function.BiPredicate; +import java.util.function.Predicate; +import java.util.stream.Stream; + +import org.eclipse.osgi.service.resolver.BundleDescription; +import org.eclipse.osgi.service.resolver.ExportPackageDescription; +import org.eclipse.pde.core.plugin.IPluginModelBase; +import org.eclipse.pde.core.plugin.PluginRegistry; +import org.osgi.framework.Version; +import org.osgi.framework.VersionRange; + +/** + * Utility for management of bundle dependency version ranges, defining rules + * governing how various specific dependencies are to be managed. + */ +public class VersionRules { + + private final VersionRule rule = VersionRule.composeAll( + new CurrentVersionRule(), // The default behaviour + new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.6.0,1.7.0)"), //$NON-NLS-1$//$NON-NLS-2$ + new SkipRule("com.ibm.icu"), //$NON-NLS-1$ + new FixedRangeRule("com.google.guava", "11.0.0") //$NON-NLS-1$ + ); + + public VersionRules() { + super(); + } + + /** + * Queries the version range that should constraint a dependency of the given {@code kind} + * on a bundle or package. + * + * @param kind + * the dependency kind + * @param dependency + * the bundle or package dependency + * + * @return the appropriate version range, or {@code null} if unknown or the range + * currently specified in the manfiest can be retained as is + */ + public VersionRange getDependencyVersionRange(DependencyKind kind, String dependency) { + return rule.apply(kind, dependency); + } + + static Version getCurrentMinorVersion(String dependencyName, boolean isPackageImport) { + Version result = Version.emptyVersion; + + if (!isPackageImport) { + IPluginModelBase model = PluginRegistry.findModel(dependencyName); + if (model != null) { + result = Version.valueOf(model.getPluginBase().getVersion()); + } + } else { + // Look for a bundle that exports the package + result = Stream.of(PluginRegistry.getActiveModels(false)) + .filter(p -> exports(p, dependencyName)) + // TODO: Sort by longest prefix match to the package name + .map(p -> getExportedVersion(p, dependencyName)) + .findFirst() + .orElse(Version.emptyVersion); + } + + if (!result.equals(Version.emptyVersion)) { + // 'Minorize' it + result = new Version(result.getMajor(), result.getMinor(), 0); + } + + return result; + } + + private static boolean exports(IPluginModelBase pluginModel, String packageName) { + boolean result = false; + + BundleDescription desc = pluginModel.getBundleDescription(); + if (desc != null) { + result = Stream.of(desc.getExportPackages()) + .anyMatch(ep -> packageName.equals(ep.getName())); + } + + return result; + } + + private static Version getExportedVersion(IPluginModelBase pluginModel, String packageName) { + // In case there is no bundle description, which would be odd at this point + Version result = Version.emptyVersion; + + BundleDescription desc = pluginModel.getBundleDescription(); + if (desc != null) { + result = Stream.of(desc.getExportPackages()) + .filter(ep -> packageName.equals(ep.getName())) + .map(ExportPackageDescription::getVersion) + .filter(Objects::nonNull) + .findAny().orElse(Version.emptyVersion); + } + + return result; + } + + // + // Nested types + // + + private interface VersionRule extends BiPredicate<DependencyKind, String>, BiFunction<DependencyKind, String, VersionRange> { + default VersionRule compose(VersionRule other) { + return new VersionRule() { + + @Override + public VersionRange apply(DependencyKind kind, String dependencyName) { + return VersionRule.this.test(kind, dependencyName) + ? VersionRule.this.apply(kind, dependencyName) + : other.apply(kind, dependencyName); + } + + @Override + public boolean test(DependencyKind kind, String dependencyName) { + return VersionRule.this.test(kind, dependencyName) || other.test(kind, dependencyName); + } + }; + } + + static VersionRule composeAll(VersionRule default_, VersionRule... rules) { + VersionRule result = default_; + for (VersionRule next : rules) { + result = next.compose(result); + } + return result; + } + } + + private static abstract class AbstractRule implements VersionRule { + private final BiPredicate<DependencyKind, String> predicate; + + AbstractRule(BiPredicate<DependencyKind, String> predicate) { + super(); + + this.predicate = predicate; + } + + AbstractRule(Predicate<String> predicate) { + this((kind, dep) -> predicate.test(dep)); + } + + @Override + public boolean test(DependencyKind kind, String dependencyName) { + return predicate.test(kind, dependencyName); + } + } + + private static final class FixedRangeRule extends AbstractRule { + private final VersionRange range; + + FixedRangeRule(String bundleID, String range) { + this(bundleID::equals, VersionRange.valueOf(range)); + } + + FixedRangeRule(Predicate<String> predicate, String range) { + this(predicate, VersionRange.valueOf(range)); + } + + FixedRangeRule(Predicate<String> predicate, VersionRange range) { + super(predicate); + + this.range = range; + } + + @Override + public VersionRange apply(DependencyKind kind, String dependencyName) { + return range; + } + } + + private static final class SkipRule extends AbstractRule { + SkipRule(String dependencyName) { + this(dependencyName::equals); + } + + SkipRule(Predicate<String> predicate) { + super(predicate); + } + + @Override + public VersionRange apply(DependencyKind kind, String dependencyName) { + return null; + } + } + + private static class CurrentVersionRule extends AbstractRule { + private CurrentVersionRule() { + super((kind, dep) -> true); + } + + @Override + public VersionRange apply(DependencyKind kind, String dependencyName) { + Version current = getCurrentMinorVersion(dependencyName, kind == DependencyKind.IMPORT_PACKAGE); + Version next = ((current == null) || current.equals(Version.emptyVersion)) + ? null + : new Version(current.getMajor() + 1, 0, 0); + + return (next == null) + ? null + : new VersionRange(VersionRange.LEFT_CLOSED, current, next, VersionRange.RIGHT_OPEN); + } + } +} diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/.project b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/.project index 5fd10003319..9659dc74a02 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/.project +++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/.project @@ -16,13 +16,29 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> @@ -30,5 +46,6 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF index 2d47ce802ef..91543975946 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.core.resources;bundle-version="3.10.0",
- org.eclipse.papyrus.dev.tests.framework;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.expressions;bundle-version="3.5.0"
-Export-Package: org.eclipse.papyrus.dev.tests.framework.internal.ui;x-internal:=true
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.dev.tests.framework.internal.ui.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.dev.tests.framework.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + com.google.guava;bundle-version="11.0.0", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.papyrus.dev.tests.framework;bundle-version="[2.0.0,3.0.0)", + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)" +Export-Package: org.eclipse.papyrus.dev.tests.framework.internal.ui;x-internal:=true +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.dev.tests.framework.internal.ui.Activator +Bundle-SymbolicName: org.eclipse.papyrus.dev.tests.framework.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/.project b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/.project index 8b08e018ffe..47c5b02925a 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/.project +++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/.project @@ -16,19 +16,30 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF index f788ffa8d97..33bd03fc65b 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF @@ -1,16 +1,15 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.core.resources;bundle-version="3.10.0",
- org.eclipse.jdt.launching;bundle-version="3.8.0",
- org.eclipse.jdt.core;bundle-version="3.11.0",
- org.eclipse.debug.core;bundle-version="3.10.0"
-Export-Package: org.eclipse.papyrus.dev.tests.framework.internal;x-internal:=true
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.dev.tests.framework.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.dev.tests.framework;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + com.google.guava;bundle-version="11.0.0", + org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)", + org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)", + org.eclipse.debug.core;bundle-version="[3.10.0,4.0.0)" +Export-Package: org.eclipse.papyrus.dev.tests.framework.internal;x-internal:=true +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.dev.tests.framework.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.dev.tests.framework;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/pom.xml b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/pom.xml index 85c5ad30046..1c4705af4b3 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/pom.xml +++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/pom.xml @@ -8,6 +8,6 @@ </parent> <artifactId>org.eclipse.papyrus.dev.tests.framework</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.project b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.project index 3ee19d0eee2..e6ca661b9c0 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.project +++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.dev.view.services.edit.request</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.dev.view.services.edit.request</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF index cd9ab1eeed4..113688fa26b 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF @@ -1,15 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.dev.view.services.edit.request.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.dev.view.services.edit.request;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", + org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.dev.view.services.edit.request.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.dev.view.services.edit.request;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/developer/org.eclipse.papyrus.developer.profile/.project b/plugins/developer/org.eclipse.papyrus.developer.profile/.project index 85e092bc300..950dab76ca1 100644 --- a/plugins/developer/org.eclipse.papyrus.developer.profile/.project +++ b/plugins/developer/org.eclipse.papyrus.developer.profile/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.developer.profile</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.developer.profile</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF index a6a8eb3d823..0b2e17079de 100644 --- a/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.developer.profile/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.developer.profile.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.developer.profile;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.developer.profile.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.developer.profile;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/developer/org.eclipse.papyrus.doc/.project b/plugins/developer/org.eclipse.papyrus.doc/.project index 8617a43572a..dc1932cbf81 100644 --- a/plugins/developer/org.eclipse.papyrus.doc/.project +++ b/plugins/developer/org.eclipse.papyrus.doc/.project @@ -1,22 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.doc</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <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>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.doc</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF index f42116749ea..2916d725ccd 100644 --- a/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.doc/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.equinox.app,
- org.eclipse.ui,
- org.eclipse.help,
- org.eclipse.ui.intro,
- org.eclipse.pde.ui;bundle-version="3.6.100"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.equinox.app;bundle-version="[1.3.0,2.0.0)", + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)", + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.doc;singleton:=true diff --git a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/.project b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/.project index 3a735d485c7..244f5d58644 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/.project +++ b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF index b1557336613..6af889ad3cf 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF @@ -1,14 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.ocl, - org.eclipse.ocl.ecore, - org.eclipse.acceleo.model, - org.eclipse.acceleo.engine, - org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.papyrus.domaincontextcodegen;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.project b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.project index 702734004ed..a10bc9e20b7 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.project +++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.project @@ -16,13 +16,26 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF index 4bc7a38775d..2ccce3270d2 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.domaincontextcodegen;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.domaincontextcodegen.provider Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.project b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.project index e46918d33ce..40934551b23 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.project +++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.domaincontextcodegen.editor</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.domaincontextcodegen.editor</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF index df727a5db6a..807baa93b99 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/META-INF/MANIFEST.MF @@ -1,19 +1,19 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.domaincontextcodegen.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport
-Export-Package: org.eclipse.papyrus.domaincontextcodegen.presentation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.domaincontextcodegen.presentation.DomainContextEditorPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.domaincontextcodegen.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.domaincontextcodegen.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.domaincontextcodegen.presentation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.domaincontextcodegen.presentation.DomainContextEditorPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.domaincontextcodegen.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/.project b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/.project index 4c9aafe844e..ce65834fabc 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/.project +++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/.project @@ -1,34 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.domaincontextcodegen</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>
- <buildCommand>
- <name>org.eclipse.acceleo.ide.ui.acceleoBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.domaincontextcodegen</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.acceleo.ide.ui.acceleoBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF index 271f296962b..f02a592608b 100644 --- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/META-INF/MANIFEST.MF @@ -1,23 +1,22 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.codegen,
- org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.acceleo.common;bundle-version="3.0.0",
- org.eclipse.acceleo.engine;bundle-version="3.0.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0"
-Export-Package: org.eclipse.papyrus.domaincontextcodegen,
- org.eclipse.papyrus.domaincontextcodegen.impl,
- org.eclipse.papyrus.domaincontextcodegen.modules,
- org.eclipse.papyrus.domaincontextcodegen.modules.utils,
- org.eclipse.papyrus.domaincontextcodegen.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.domaincontextcodegen;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.codegen;bundle-version="[2.11.0,3.0.0)", + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.acceleo.engine;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)" +Export-Package: org.eclipse.papyrus.domaincontextcodegen, + org.eclipse.papyrus.domaincontextcodegen.impl, + org.eclipse.papyrus.domaincontextcodegen.modules, + org.eclipse.papyrus.domaincontextcodegen.modules.utils, + org.eclipse.papyrus.domaincontextcodegen.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.domaincontextcodegen;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.project b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.project index 4fe341a1c42..5dcae312190 100644 --- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.project +++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.gmf.editpartview</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.gmf.editpartview</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF index 45e9cfb15a3..a4b51476dae 100644 --- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF @@ -1,19 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.gmf.editpartview,
- org.eclipse.papyrus.gmf.editpartview.view
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.1"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.gmf.editpartview.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.editpartview;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.gmf.editpartview, + org.eclipse.papyrus.gmf.editpartview.view +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.gmf.editpartview.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.gmf.editpartview;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.project b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.project index 5644609803c..feb1264cdec 100644 --- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.project +++ b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.gmf.editpoliciesstates</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.gmf.editpoliciesstates</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF index 4ed7eb8af8e..944ab132610 100644 --- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF @@ -1,17 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.gmf.editpoliciesstates.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.editpoliciesstates;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.gmf.editpoliciesstates.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.gmf.editpoliciesstates;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.project b/plugins/developer/org.eclipse.papyrus.gmf.figureview/.project index 5359c719742..d7f2eb2d1b2 100644 --- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.project +++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.gmf.figureview</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.gmf.figureview</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF index e249b19724b..6ddf0f40740 100644 --- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF @@ -1,19 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.gmf.figureview,
- org.eclipse.papyrus.gmf.figureview.view
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.gmf.figureview.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.figureview;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.gmf.figureview, + org.eclipse.papyrus.gmf.figureview.view +Require-Bundle: org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.gmf.figureview.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.gmf.figureview;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.project b/plugins/developer/org.eclipse.papyrus.gmfgenextension/.project index ae2d7be04b8..dcd801b6b9e 100644 --- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.project +++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.gmfgenextension</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.gmfgenextension</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF index 4f68991afb3..0aa105c6d36 100644 --- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF @@ -1,23 +1,22 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,
- org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="2.10.0";visibility:=reexport,
- org.eclipse.gmf.codegen;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.uml2.uml;bundle-version="3.0.0",
- org.eclipse.uml2.uml.edit;bundle-version="3.0.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0"
-Export-Package: org.eclipse.papyrus.papyrusgmfgenextension,
- org.eclipse.papyrus.papyrusgmfgenextension.impl,
- org.eclipse.papyrus.papyrusgmfgenextension.popupaction,
- org.eclipse.papyrus.papyrusgmfgenextension.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.gmfgenextension;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.domaincontextcodegen;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.gmf.codegen;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)", + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)" +Export-Package: org.eclipse.papyrus.papyrusgmfgenextension, + org.eclipse.papyrus.papyrusgmfgenextension.impl, + org.eclipse.papyrus.papyrusgmfgenextension.popupaction, + org.eclipse.papyrus.papyrusgmfgenextension.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.gmfgenextension;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project index d305eea197c..6ddb42c193b 100644 --- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project @@ -16,13 +16,32 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF index 069e7c13fcc..8b535c34395 100644 --- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF @@ -1,13 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.emf.edit;bundle-version="2.7.1", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.emf.workspace;bundle-version="1.4.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0", - org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/.project b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/.project index f9dad31a62c..50d3cbb97ea 100644 --- a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/.project +++ b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.extendedtypes.elementtypeview</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.extendedtypes.elementtypeview</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF index 465f774718d..19f01467c88 100644 --- a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/META-INF/MANIFEST.MF @@ -1,20 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.extendedtypes.elementtypeview,
- org.eclipse.papyrus.infra.extendedtypes.elementtypeview.view
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.elementtypeview.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.elementtypeview;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.extendedtypes.elementtypeview, + org.eclipse.papyrus.infra.extendedtypes.elementtypeview.view +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.elementtypeview.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.elementtypeview;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project b/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project index 16d40fe4672..84b2d16aff8 100644 --- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project +++ b/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css.debug</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css.debug</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF index e9c39204b8c..0c8cbd34153 100644 --- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF @@ -1,20 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.emf.ecore;bundle-version="2.9.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.e4.ui.css.core;bundle-version="0.10.2", - org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.2.0", - org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.7.0", - org.eclipse.draw2d;bundle-version="3.9.0", - org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.project b/plugins/developer/org.eclipse.papyrus.mwe2.utils/.project index 35da3c39db8..c5290b1e383 100644 --- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.project +++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/.project @@ -21,13 +21,25 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> @@ -36,5 +48,6 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF index 3127addaaf3..f4e1d4ae2ea 100644 --- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF @@ -1,20 +1,19 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.mwe.core,
- org.eclipse.uml2.uml,
- org.apache.commons.logging,
- org.eclipse.m2m.qvt.oml,
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.3",
- org.eclipse.emf.mwe.utils;bundle-version="1.3.10"
-Export-Package: org.eclipse.papyrus.mwe2.utils,
- org.eclipse.papyrus.mwe2.utils.components,
- org.eclipse.papyrus.mwe2.utils.messages
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.mwe2.utils.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.mwe2.utils
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.mwe.core;bundle-version="[1.3.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)", + org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.mwe2.utils, + org.eclipse.papyrus.mwe2.utils.components, + org.eclipse.papyrus.mwe2.utils.messages +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.mwe2.utils.Activator +Bundle-SymbolicName: org.eclipse.papyrus.mwe2.utils +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/.classpath b/plugins/developer/org.eclipse.papyrus.releng.dev.release/.classpath new file mode 100644 index 00000000000..075009d7745 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/.classpath @@ -0,0 +1,6 @@ +<?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/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/.project b/plugins/developer/org.eclipse.papyrus.releng.dev.release/.project new file mode 100644 index 00000000000..98d20bdbba9 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/.project @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.releng.dev.release</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.dev.release/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..98693159659 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.releng.dev.release;singleton:=true diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties b/plugins/developer/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties new file mode 100644 index 00000000000..ae3c2cce87d --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,14 @@ +# +# Copyright (c) 2016 Christian W. Damus 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: +# Christian W. Damus - initial API and implementation +# + +Bundle-Vendor = Eclipse Modeling Project +Bundle-Name = Papyrus Main Release Definition diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/about.html b/plugins/developer/org.eclipse.papyrus.releng.dev.release/about.html new file mode 100644 index 00000000000..42595040e90 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>December 22, 2008</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html>
\ No newline at end of file diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/build.properties b/plugins/developer/org.eclipse.papyrus.releng.dev.release/build.properties new file mode 100644 index 00000000000..108325c83cb --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/build.properties @@ -0,0 +1,7 @@ +bin.includes = META-INF/,\ + .,\ + about.html,\ + OSGI-INF/,\ + OSGI-INF/l10n/bundle.properties +src.includes = about.html,\ + release.* diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/pom.xml b/plugins/developer/org.eclipse.papyrus.releng.dev.release/pom.xml new file mode 100644 index 00000000000..06088626c08 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/pom.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.papyrus.developer</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <artifactId>org.eclipse.papyrus.releng.dev.release</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest Binary files differnew file mode 100644 index 00000000000..3a564a7489d --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.properties b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.properties new file mode 100644 index 00000000000..f92503e5a9a --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.properties @@ -0,0 +1,5 @@ +# +#Fri Feb 19 10:25:34 EST 2016 +baseline.for.integration=true +root.projects=org.eclipse.papyrus.dev.feature org.eclipse.papyrus.releng.dev.release +show.deviations=false diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml new file mode 100644 index 00000000000..8be00f5381a --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<release> + <feature name="org.eclipse.papyrus.dev.feature" version="1.1.3"> + <feature name="org.eclipse.papyrus.junit.feature" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.codegen" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.def" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.view.services.edit.request" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmf.editpoliciesstates" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmf.editpartview" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmf.figureview" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmfgenextension" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.debug" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.domaincontextcodegen" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.domaincontextcodegen.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.domaincontextcodegen.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.releng.tools" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.project.management" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.commandstack" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.assistants.codegen" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.developer.mde" version="1.1.3"/> + <plugin name="org.eclipse.b3.aggregator" version="0.2.0"/> + <plugin name="org.eclipse.b3.aggregator.legacy" version="0.2.0"/> + <plugin name="org.eclipse.b3.cli" version="0.2.0"/> + <plugin name="org.eclipse.b3.p2" version="0.2.0"/> + <plugin name="org.eclipse.b3.util" version="0.2.0"/> + <plugin name="org.eclipse.papyrus.mwe2.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.tests.framework" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.tests.framework.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.elementtypesconfigurations.developer" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.junit.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.junit.framework" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.junit.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.bundles.tests" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework.annotations" version="1.1.3"/> + <plugin name="org.eclipse.upr.utp" version="0.9.0"/> + </feature> + <plugin name="org.eclipse.b3.aggregator" version="0.2.0"/> + <plugin name="org.eclipse.b3.aggregator.legacy" version="0.2.0"/> + <plugin name="org.eclipse.b3.cli" version="0.2.0"/> + <plugin name="org.eclipse.b3.p2" version="0.2.0"/> + <plugin name="org.eclipse.b3.util" version="0.2.0"/> + <plugin name="org.eclipse.papyrus.bundles.tests" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.codegen" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.def" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.assistants.codegen" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.project.management" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.tests.framework" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.tests.framework.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dev.view.services.edit.request" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.developer.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.domaincontextcodegen" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.domaincontextcodegen.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.domaincontextcodegen.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.domaincodegen.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.elementtypesconfigurations.developer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmf.editpartview" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmf.editpoliciesstates" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmf.figureview" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.gmfgenextension" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.commandstack" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes.elementtypeview" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.debug" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.junit.framework" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.junit.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.mwe2.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.releng.tools" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework.annotations" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.tests.framework.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.developer.mde" version="1.1.3"/> + <plugin name="org.eclipse.upr.utp" version="0.9.0"/> + + <plugin name="org.eclipse.papyrus.releng.dev.release" version="1.1.3"/> +</release> diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/.classpath b/plugins/developer/org.eclipse.papyrus.releng.main.release/.classpath new file mode 100644 index 00000000000..075009d7745 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/.classpath @@ -0,0 +1,6 @@ +<?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/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/.project b/plugins/developer/org.eclipse.papyrus.releng.main.release/.project new file mode 100644 index 00000000000..7184f995779 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/.project @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.releng.main.release</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.main.release/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..4bd926dd9ee --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.releng.main.release;singleton:=true diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties b/plugins/developer/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties new file mode 100644 index 00000000000..ae3c2cce87d --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,14 @@ +# +# Copyright (c) 2016 Christian W. Damus 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: +# Christian W. Damus - initial API and implementation +# + +Bundle-Vendor = Eclipse Modeling Project +Bundle-Name = Papyrus Main Release Definition diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/about.html b/plugins/developer/org.eclipse.papyrus.releng.main.release/about.html new file mode 100644 index 00000000000..42595040e90 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>December 22, 2008</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html>
\ No newline at end of file diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/build.properties b/plugins/developer/org.eclipse.papyrus.releng.main.release/build.properties new file mode 100644 index 00000000000..108325c83cb --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/build.properties @@ -0,0 +1,7 @@ +bin.includes = META-INF/,\ + .,\ + about.html,\ + OSGI-INF/,\ + OSGI-INF/l10n/bundle.properties +src.includes = about.html,\ + release.* diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/pom.xml b/plugins/developer/org.eclipse.papyrus.releng.main.release/pom.xml new file mode 100644 index 00000000000..1c12d2aa0de --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/pom.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.papyrus.developer</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <artifactId>org.eclipse.papyrus.releng.main.release</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest Binary files differnew file mode 100644 index 00000000000..d2b73a5fe29 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.properties b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.properties new file mode 100644 index 00000000000..6386955392d --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.properties @@ -0,0 +1,5 @@ +# +#Tue Feb 16 15:00:11 EST 2016 +baseline.for.integration=true +root.projects=org.eclipse.papyrus.releng.main.release org.eclipse.papyrus.sdk.feature +show.deviations=false diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml new file mode 100644 index 00000000000..85f9b73d6ca --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml @@ -0,0 +1,780 @@ +<?xml version="1.0" encoding="UTF-8"?> +<release> + <feature name="org.eclipse.papyrus.customization.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.customization.paletteconfiguration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.properties.generation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.properties.model.xwt" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.palette" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.expansion.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.expansion.editor" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.doc.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.cdo.ui.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.copypaste.ui.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dsml.validation.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.common.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.newchild.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.controlmode.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.layers.documentation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.req.reqif.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.profile.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.modelrepair.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.assistants.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.search.ui.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.properties.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.aggregate.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.doc" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.editor.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.editor" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.emf.facet.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.emf.facet.common.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.common.sdk.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.common.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.metamodel.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.sdk.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.catalog" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.metamodel.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.ocl.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.ocl.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.catalog" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.jface.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.pde.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.swt" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.widgets.celleditors" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.core.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.log" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.sasheditor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.sasheditor.di" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.sashwindows.di" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.pluginexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.tools" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.discovery.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.discovery" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.discovery.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.discovery.ui.menu" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.emf.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.diagram.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.appearance" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.readonly" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.gmf" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.extendedtypes" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.onefile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.hyperlink" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.psf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.newchild" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.newchild.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.sync" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.filters" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.filters.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties.editor" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.gmfdiag.css.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.configuration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css3.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.theme" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.model" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.gmfdiag.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.commands" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.outline" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.preferences" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.gef" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.extensionpoints.editors" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.hyperlink" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.viewersearcher" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.export" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.canonical" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.welcome" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.nattable.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.nattable.model" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.model.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.model.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.views.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.views.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.gmfdiag" version="1.1.3"/> + <plugin name="org.eclipse.nebula.widgets.nattable.core" version="1.4.0"/> + <plugin name="ca.odell.glazedlists" version="1.9.0"/> + <plugin name="org.eclipse.nebula.widgets.nattable.extension.glazedlists" version="1.4.0"/> + </feature> + <feature name="org.eclipse.papyrus.infra.services.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.services.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.controlmode.history" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.decoration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.markerlistener" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.resourceloading" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.validation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.labelprovider" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.semantic" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.viewersearch" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.viewlabelprovider" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.openelement" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.localizer" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.ui.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.onefile.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.ui.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.ui.resources" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.edit.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.resourceloading.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.editor.welcome" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.editor.welcome.nattable" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.viewpoints.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.viewpoints.configuration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.policy" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.preferences" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.infra.widget.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.infra.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.widgets.toolbox" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.sdk.feature" version="1.1.3"> + <feature name="org.eclipse.papyrus.customization.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.editor.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.core.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.gmfdiag.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.services.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.ui.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.widget.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.sysml.diagram.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.sysml.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.modelexplorer.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.properties.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.tools.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.ui.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.views.modelexplorer.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.views.properties.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.diagram.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.sysml.properties.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.emf.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.sysml.modelexplorer.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.textedit.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.alf.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.discovery.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.views.validation.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.doc.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.views.search.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.search.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.xtext.integration.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.nattable.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.sysml.nattable.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.nattable.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.gmfdiag.css.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.diagram.css.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.emf.facet.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.infra.viewpoints.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.decoratormodel.feature" version="1.1.3"/> + <feature name="org.eclipse.papyrus.uml.assistants.feature" version="1.1.3"/> + <plugin name="com.google.guava" version="15.0.0"/> + <plugin name="org.eclipse.papyrus.eclipse.project.editors" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.sysml.diagram.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.sysml.diagram.blockdefinition" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.requirement" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.internalblock" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.parametric" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.css" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.sysml.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.sysml" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.service.types" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.edit" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.sysml.modelexplorer.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.sysml.modelexplorer" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.sysml.nattable.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.sysml.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.requirement" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.requirement.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.allocation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.allocation.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.menu" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.sysml.properties.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.sysml.properties" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.alf.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.alf.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.common.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.libraries" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.to.fuml" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.ui" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.assistants.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.profile.assistants.generator" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.assistants.generator.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.decoratormodel.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.decoratormodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.properties" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.diagram.css.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.diagram.css" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.css.palette" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.diagram.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.diagram.clazz" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common.groups" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common.palette.customaction" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.component" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.deployment" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.icons" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.paletteconfiguration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.statemachine" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.usecase" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.wizards" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.communication" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.sequence" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.activity" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.composite" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.dnd" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.stereotype.edition" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.timing" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.interactionoverview" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.symbols" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.symbols.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.linklf" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.commands" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.controlmode.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.extensionpoints" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.icons" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.import" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.perspective" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.drafter" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.resourceloading.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.service.types" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.service.types.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.templaterepository" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.documentation.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.appearance" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.oclconstraintevaluation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.service.validation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.services.decoration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.modelrepair" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.filters" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.filters.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.elementtypesconfigurations" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.modelexplorer.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.modelexplorer.widgets" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.nattable.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.generic" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.generic.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.xtext.integration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.clazz.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.xtext.valuespecification" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.stereotype.display" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.properties.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.properties.xtext" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.search.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.search.ui" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.textedit.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.common.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.common.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.message.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.message.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.parameter.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.parameter.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.property.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.property.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.state.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.state.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.transition.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.transition.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.javaconstraint" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.port.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.port.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.valuespecification.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.tools.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.tools.extendedtypes" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.tools.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.tools" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.ui.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.ui" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.uml.xtext.integration.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.uml.xtext.integration.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.xtext.integration.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.xtext.integration.validation" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.views.modelexplorer.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.views.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.modelexplorer.resourceloading" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.modelexplorer.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.modelexplorer.newchild" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.views.properties.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.views.properties" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.views.search.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.views.search" version="1.1.3"/> + </feature> + <feature name="org.eclipse.papyrus.views.validation.feature" version="1.1.3"> + <plugin name="org.eclipse.papyrus.views.validation" version="1.1.3"/> + </feature> + <plugin name="ca.odell.glazedlists" version="1.9.0"/> + <plugin name="com.google.guava" version="15.0.0"/> + <plugin name="org.eclipse.nebula.widgets.nattable.core" version="1.4.0"/> + <plugin name="org.eclipse.nebula.widgets.nattable.extension.glazedlists" version="1.4.0"/> + <plugin name="org.eclipse.papyrus.cdo.ui.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.copypaste.ui.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.extendedtypes" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.extendedtypes.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.extendedtypes.uml" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.palette" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.paletteconfiguration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.properties.generation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.customization.properties.model.xwt" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.dsml.validation.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.eclipse.project.editors" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.aggregate.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.common.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.common.sdk.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.common.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.metamodel.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.metamodel.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.sdk.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.custom.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.catalog" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.metamodel.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.efacet.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.java.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.ocl.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.ocl.metamodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.catalog" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.emf.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.jface.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.pde.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.swt" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.util.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.widgets.celleditors" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.extensionpoints.editors" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.constraints.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.log" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.pluginexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.sasheditor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.sasheditor.di" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.core.sashwindows.di" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.discovery" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.discovery.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.discovery.ui.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.editor.welcome" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.editor.welcome.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.elementtypesconfigurations.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.appearance" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.diagram.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.gmf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.emf.readonly" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.extendedtypes.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.filters" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.filters.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.assistant.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.canonical" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.commands" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.common.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.configuration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.model" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css.theme" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css3.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.expansion.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.expansion.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.export" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.gef" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.hyperlink" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.outline" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.preferences" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.viewersearcher" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.welcome" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.gmfdiag.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.hyperlink" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.gmfdiag" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.model" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.model.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.model.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.views.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.nattable.views.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.newchild" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.newchild.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.newchild.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.onefile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.onefile.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.properties.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.psf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.controlmode.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.controlmode.history" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.decoration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.edit.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.labelprovider" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.localizer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.markerlistener" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.openelement" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.resourceloading" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.resourceloading.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.semantic" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.validation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.viewersearch" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.services.viewlabelprovider" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.sync" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.tools" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.ui.emf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.ui.resources" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.configuration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.editor" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.policy" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.viewpoints.preferences" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.infra.widgets.toolbox" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.layers.documentation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.req.reqif.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.blockdefinition" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.css" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.internalblock" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.parametric" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.requirement" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.diagram.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.allocation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.allocation.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.requirement" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.nattable.requirement.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.sysml.service.types" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.common.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.libraries" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.to.fuml" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.alf.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.appearance" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.commands" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.controlmode.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.controlmode" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.decoratormodel.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.activity" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.clazz" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common.groups" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.common.palette.customaction" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.communication" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.component" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.composite" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.css" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.css.palette" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.deployment" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.dnd" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.emftree" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.icons" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.interactionoverview" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.linklf" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.paletteconfiguration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.profile.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.sequence" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.statemachine" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.stereotype.edition" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.symbols" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.symbols.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.timing" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.usecase" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.diagram.wizards" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.documentation.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.elementtypesconfigurations" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.extensionpoints" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.filters" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.filters.edit" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.icons" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.import" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.modelexplorer.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.modelrepair" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.modelrepair.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.clazz.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.generic" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.generic.config" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.menu" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.stereotype.display" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.xtext.integration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.nattable.xtext.valuespecification" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.navigation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.oclconstraintevaluation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.perspective" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.assistants.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.assistants.generator" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.assistants.generator.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.drafter" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.drafter.documentation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.newchildmenu.generator" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.properties.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.resourceloading.profile" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.search.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.search.ui.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.service.types" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.service.types.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.service.validation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.services.decoration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.templaterepository" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.common.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.common.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.javaconstraint" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.message.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.message.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.parameter.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.parameter.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.port.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.port.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.property.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.property.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.state.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.state.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.transition.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.transition.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.valuespecification.xtext" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.tools" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.tools.extendedtypes" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.tools.utils" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.ui.perspectiveconfiguration" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.xtext.integration.core" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.xtext.integration.ui" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.uml.xtext.integration.validation" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.modelexplorer" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.modelexplorer.newchild" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.modelexplorer.resourceloading" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.modelexplorer.widgets" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.properties" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.properties.doc" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.search" version="1.1.3"/> + <plugin name="org.eclipse.papyrus.views.validation" version="1.1.3"/> + + <plugin name="org.eclipse.papyrus.releng.main.release" version="1.1.3"/> +</release> diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.project b/plugins/developer/org.eclipse.papyrus.releng.tools/.project index b85bc70e191..122ecdcca98 100644 --- a/plugins/developer/org.eclipse.papyrus.releng.tools/.project +++ b/plugins/developer/org.eclipse.papyrus.releng.tools/.project @@ -1,34 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.releng.tools</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>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.releng.tools</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>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF index 6f654e72da3..3780cc3872b 100644 --- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF @@ -1,21 +1,17 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.b3.aggregator;bundle-version="0.2.0",
- org.eclipse.b3.aggregator.legacy;bundle-version="0.2.0",
- org.eclipse.oomph.setup.targlets;bundle-version="1.1.0",
- org.eclipse.oomph.p2;bundle-version="1.1.0",
- org.eclipse.emf.edit;bundle-version="2.10.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.oomph.workingsets;bundle-version="1.1.0",
- org.eclipse.oomph.setup.workingsets;bundle-version="1.1.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.releng.tools.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.releng.tools;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.b3.aggregator;bundle-version="[0.2.0,1.0.0)", + org.eclipse.b3.aggregator.legacy;bundle-version="[0.2.0,1.0.0)", + org.eclipse.oomph.setup.targlets;bundle-version="[1.3.0,2.0.0)", + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)", + com.google.guava;bundle-version="11.0.0", + org.eclipse.oomph.setup.workingsets;bundle-version="[1.3.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.releng.tools.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.releng.tools;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.project b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.project index b293060ac8b..6a9d9eb813b 100644 --- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.project +++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.developer.mde</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.developer.mde</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF index 5800a5549da..a5673891985 100644 --- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF @@ -1,33 +1,22 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.core.resources,
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.ecore.edit;bundle-version="2.9.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.developper.mde.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.developer.mde;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.developper.mde.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.developer.mde;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project index b9e4bc91f00..02c24abefb5 100644 --- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF index 0cf9281dd12..ef8f389580b 100644 --- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.doc;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project index 6312f67d350..b6d81bb75dc 100644 --- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF index e281b1b2db9..8694f6f5bab 100644 --- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.copypaste.ui.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.copypaste.ui.doc;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project index 3116242303c..d56b4fd3108 100644 --- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.dsml.validation.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.dsml.validation.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF index ba279cfc6c8..3a582ffdd47 100644 --- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common.doc;bundle-version="1.2.0",
- org.eclipse.help;bundle-version="3.6.0"
-Bundle-Vendor: %vendorName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.common.doc;bundle-version="[1.2.0,2.0.0)", + org.eclipse.help;bundle-version="[3.7.0,4.0.0)" +Bundle-Vendor: %vendorName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.doc;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.doc/.project index af8565ff60e..54f700c02dc 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.project @@ -1,34 +1,58 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF index 486eec28f4a..fe3bbb58da9 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.ui.intro;bundle-version="3.4.0",
- org.eclipse.pde.ui;bundle-version="3.8.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)", + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.doc;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project index 318bf6a9eec..ce3f37232ed 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.common.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.common.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF index 887140eee33..6e32578d004 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project index 9b2f21dda0c..30363976024 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF index c5cb2e56faa..3bbf8a4f45a 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: CSS Documentation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: CSS Documentation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project index 30d8f853e0e..efe3bf0d1b0 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF index e82745d8fdf..ca9f38a26a3 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Papyrus Table Documentation
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Papyrus Table Documentation +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project index 687350b13e3..b4ab10aa6a6 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project @@ -1,34 +1,58 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.newchild.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.newchild.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF index 1b8ee121ba3..b495e0c25c3 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: New Child Documentation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: New Child Documentation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.doc;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project index 5f14405dd5c..9035173ba9a 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.controlmode.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.controlmode.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF index b04b8e55e9f..1fd88530a0a 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.doc;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project index 6423e76bc97..b536f189112 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF index 1874bad2de2..9e0c1a84c78 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.project b/plugins/doc/org.eclipse.papyrus.layers.documentation/.project index 5d11eab7f79..23974a6132d 100644 --- a/plugins/doc/org.eclipse.papyrus.layers.documentation/.project +++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF index 3da0006b6cb..f888b40bea5 100644 --- a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.layers.documentation;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.layers.documentation;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project index a778de96791..61e6e6c141a 100644 --- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.req.reqif.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.req.reqif.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF index ea5b51981f3..d3cae19b204 100644 --- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Description: This is the plugin that present the user documentation of the ReqIF import
-Bundle-SymbolicName: org.eclipse.papyrus.req.reqif.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Description: This is the plugin that present the user documentation of the ReqIF import +Bundle-SymbolicName: org.eclipse.papyrus.req.reqif.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project index 767eb789dcf..ad154f345e8 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF index bb0251a37b1..dc4bdf4db47 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %vendorName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %vendorName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project index 9d896a5995b..d357827a6ee 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.common.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.common.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF index 772969c948b..b6d54a4ab05 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project index b03d5dc5a29..df4219b7d22 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.profile.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.profile.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF index 94d2f63a01f..cdbaea0c5df 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.doc;bundle-version="1.2.0",
- org.eclipse.help;bundle-version="3.6.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Profile Documentation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)", + org.eclipse.help;bundle-version="[3.7.0,4.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Profile Documentation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.doc/.project index bf12f5f0c00..be46ba2b957 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF index 9df882c6f67..d790da01603 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Papyrus UML User Guide
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Papyrus UML User Guide +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project index 6954c03addb..3f9ebae1ff2 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF index 767ad3bc757..d44def3d238 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %vendorName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %vendorName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project index 51c5c0048c9..90d68cc44a2 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF index dfb236e1f8f..2f58e83f309 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %vendorName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %vendorName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project index 01dd3d2eb5c..3c836f5aaef 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF index 4746728a2ca..2a21c34013e 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: %vendorName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.search.ui.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %vendorName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.search.ui.doc;singleton:=true diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project index 655f09640a0..b8e3e1630a7 100644 --- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project +++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.properties.doc</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>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.properties.doc</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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF index f103fc6e2ed..137495bd603 100644 --- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.doc;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Properties view Documentation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.views.properties.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Properties view Documentation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.views.properties.doc;singleton:=true diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.classpath b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.classpath index 49a283a34c3..eca7bdba8f0 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.classpath +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.classpath @@ -1,7 +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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> <classpathentry kind="src" path="src"/> -</classpath>
\ No newline at end of file + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.project b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.project index a37a2764ede..3adca6c4f7c 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.project +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs index c585cc455ae..b3aa6d60f94 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ 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.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF index ccac5349524..b9714dff646 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF @@ -2,20 +2,16 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.eclipse.project.editors.file, org.eclipse.papyrus.eclipse.project.editors.interfaces, org.eclipse.papyrus.eclipse.project.editors.project -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.core.resources, - org.eclipse.jdt.core, - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.pde.ui;bundle-version="3.6.100", - org.eclipse.emf.ecore;bundle-version="2.10.0" +Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)", + org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.eclipse.project.editors.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/pom.xml b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/pom.xml index 872d5ce559d..4b1502b4f2d 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/pom.xml +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.eclipse.project.editors</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/Activator.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/Activator.java index db1f9227ddb..e6f578de4c0 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/Activator.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/Activator.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,13 +8,16 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors; import org.eclipse.papyrus.infra.core.log.LogHelper; +import org.eclipse.pde.core.project.IBundleProjectService; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.osgi.util.tracker.ServiceTracker; /** * The activator class controls the plug-in life cycle @@ -30,35 +32,30 @@ public class Activator extends AbstractUIPlugin { public static LogHelper log; + private ServiceTracker<IBundleProjectService, IBundleProjectService> bundleProjectService; + /** * The constructor */ public Activator() { + super(); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext - * ) - */ @Override public void start(final BundleContext context) throws Exception { super.start(context); plugin = this; log = new LogHelper(this); + + bundleProjectService = new ServiceTracker<>(context, IBundleProjectService.class, null); + bundleProjectService.open(); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext - * ) - */ @Override public void stop(final BundleContext context) throws Exception { + bundleProjectService.close(); + bundleProjectService = null; + plugin = null; super.stop(context); } @@ -72,4 +69,12 @@ public class Activator extends AbstractUIPlugin { return plugin; } + /** + * Obtains the PDE's bundle project service, if available. + * + * @return the bundle project service, or {@code null} if none + */ + public IBundleProjectService getBundleProjectService() { + return bundleProjectService.getService(); + } } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/AbstractFileEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/AbstractFileEditor.java index 2fbe4dd44a1..7279d4d4e8c 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/AbstractFileEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/AbstractFileEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +8,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.file; @@ -33,6 +33,7 @@ public abstract class AbstractFileEditor implements IFileEditor { /** the Eclipse Project */ private final IProject project; + private boolean dirty; /** * @@ -48,28 +49,19 @@ public abstract class AbstractFileEditor implements IFileEditor { /** * * @return - * the eclipse project + * the eclipse project */ + @Override public IProject getProject() { return this.project; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#init() - * - * {@inheritDoc} - */ + @Override public void init() { - + // Pass } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingFiles() - * - * {@inheritDoc} - */ + @Override public Set<String> getMissingFiles() { return new HashSet<String>(); } @@ -79,7 +71,7 @@ public abstract class AbstractFileEditor implements IFileEditor { * @param text * the initial text * @return - * an input stream + * an input stream */ protected InputStream getInputStream(final String text) { if (text == null) { @@ -99,24 +91,49 @@ public abstract class AbstractFileEditor implements IFileEditor { return is; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor.plugin.AbstractEditor#exists() - * - * {@inheritDoc} - */ + @Override public boolean exists() { return getMissingFiles().size() == 0; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IFileEditor#create() - * - * {@inheritDoc} - */ + @Override public void create() { createFiles(getMissingFiles()); init(); } + + /** + * @since 2.0 + */ + @Override + public boolean isDirty() { + return dirty; + } + + /** + * Marks me {@linkplain #isDirty() dirty}. + * + * @since 2.0 + */ + protected final void touch() { + this.dirty = true; + } + + /** + * @since 2.0 + */ + @Override + public final void save() { + if (isDirty()) { + doSave(); + dirty = false; + } + } + + /** + * Implemented by subclasses to perform the save behaviour. + * + * @since 2.0 + */ + protected abstract void doSave(); } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BuildEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BuildEditor.java index cfb832ef2d3..6fba9a140a7 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BuildEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BuildEditor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,31 +9,34 @@ * Contributors: * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation * Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr + * Christian W. Damus - bug 485220 + * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.file; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Arrays; import java.util.List; import java.util.Properties; import java.util.Set; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.ecore.resource.impl.PlatformResourceURIHandlerImpl; import org.eclipse.papyrus.eclipse.project.editors.Activator; import org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor; -import org.eclipse.papyrus.infra.widgets.util.FileUtil; public class BuildEditor extends AbstractFileEditor implements IBuildEditor { /** the build config */ private Properties buildConfig; - /** the buidl file */ - private File buildFile; + /** the build file */ + private IFile buildFile; /** * The build key to edit @@ -50,7 +53,7 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { * the eclipse project */ public BuildEditor(final IProject project) { - super(project); + this(project, null); } /** @@ -67,49 +70,35 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { */ public BuildEditor(final IProject project, String buildKey) { super(project); + + buildFile = project.getFile(BUILD_PROPERTIES_FILE); if (buildKey != null) { this.buildKey = buildKey; } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#init() - * - * {@inheritDoc} - */ @Override public void init() { this.buildConfig = new Properties(); - this.buildFile = getBuildProperties(); - if (this.buildFile != null && this.buildFile.exists()) { - try { - this.buildConfig.load(new FileInputStream(this.buildFile)); - } catch (FileNotFoundException e) { - Activator.log.error(e); + if (this.buildFile.exists()) { + try (InputStream input = this.buildFile.getContents()) { + this.buildConfig.load(input); + } catch (CoreException e) { + Activator.log.log(e.getStatus()); } catch (IOException e) { Activator.log.error(e); } } } - - private File getBuildProperties() { - return this.buildFile = FileUtil.getWorkspaceFile("/" + getProject().getName() + "/" + BUILD_PROPERTIES_FILE); //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#addToBuild(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void addToBuild(final String path) { if (exists()) { String currentValue = this.buildConfig.getProperty(buildKey); if (Arrays.asList(getElementsInBuild()).contains(path)) { return; } + touch(); if (currentValue == null || currentValue.trim().equals("")) { //$NON-NLS-1$ this.buildConfig.setProperty(buildKey, path); } else { @@ -118,14 +107,11 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#removeFromBuild(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void removeFromBuild(String path) { if (isRegisteredSourceFolder(path)) { + touch(); + // Get the files from the build List<String> allFiles = Arrays.asList(getElementsInBuild()); @@ -141,19 +127,11 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { } } - /** - * - * @throws Throwable - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#save() - * - * {@inheritDoc} - */ - public void save() { + @Override + protected void doSave() { if (exists()) { - try { - this.buildConfig.store(new FileOutputStream(this.buildFile), ""); - } catch (FileNotFoundException ex) { - Activator.log.error(ex); + try (OutputStream output = new PlatformResourceURIHandlerImpl.PlatformResourceOutputStream(this.buildFile, false, true, null)) { + this.buildConfig.store(output, ""); //$NON-NLS-1$ } catch (IOException ex) { Activator.log.error(ex); } @@ -161,14 +139,11 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#registerSourceFolder(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void registerSourceFolder(final String path) { if (exists() && !isRegisteredSourceFolder(path)) { + touch(); + String currentValue = this.buildConfig.getProperty(SOURCE_FOLDER_KEY); if (currentValue == null || currentValue.trim().equals("")) { //$NON-NLS-1$ this.buildConfig.setProperty(SOURCE_FOLDER_KEY, path); @@ -178,37 +153,21 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#isRegistred(java.lang.String) - * - * {@inheritDoc} - */ + @Override public boolean isRegisteredSourceFolder(final String path) { return Arrays.asList(getSourceFolders()).contains(path); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#getMissingFiles() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingFiles() { Set<String> files = super.getMissingFiles(); - if (!getBuildProperties().exists()) { + if (!this.buildFile.exists()) { files.add(BUILD_PROPERTIES_FILE); } return files; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getSourceFolders() - * - * {@inheritDoc} - */ + @Override public String[] getSourceFolders() { if (exists()) { String currentValue = this.buildConfig.getProperty(SOURCE_FOLDER_KEY, "").replaceAll("\t|\r|\n", "").trim(); @@ -218,45 +177,26 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { return new String[0]; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#exists() - * - * {@inheritDoc} - */ @Override public boolean exists() { - return this.buildFile.getParentFile().exists() && this.buildFile.exists() && super.exists(); + return super.exists() && this.buildFile.exists(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#createFiles(Set) - * - * {@inheritDoc} - */ + @Override public void createFiles(final Set<String> files) { if (files.contains(BUILD_PROPERTIES_FILE)) { if (!this.buildFile.exists()) { - if (!this.buildFile.getParentFile().exists()) { - this.buildFile.getParentFile().mkdirs(); - } try { - this.buildFile.createNewFile(); + this.buildFile.create(new ByteArrayInputStream(new byte[0]), false, null); init(); - } catch (IOException e) { - Activator.log.error(e); + } catch (CoreException e) { + Activator.log.log(e.getStatus()); } } } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getElementsInBuild() - * - * {@inheritDoc} - */ + @Override public String[] getElementsInBuild() { String value = this.buildConfig.getProperty(buildKey); return splitValues(value); @@ -269,11 +209,14 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { return value.replace("\t|\r|\n", "").split(","); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public void registerBinFolder(String binFolder) { if (isRegisteredBinFolder(binFolder)) { return; } + touch(); + String value = this.buildConfig.getProperty(BIN_KEY, ""); //$NON-NLS-1$ if (value.trim().equals("")) { //$NON-NLS-1$ value = binFolder; @@ -283,6 +226,7 @@ public class BuildEditor extends AbstractFileEditor implements IBuildEditor { this.buildConfig.setProperty(BIN_KEY, value); } + @Override public boolean isRegisteredBinFolder(String binFolder) { List<String> folders = Arrays.asList(splitValues(this.buildConfig.getProperty(BIN_KEY, ""))); //$NON-NLS-1$ return folders.contains(binFolder); diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BundlePropertiesEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BundlePropertiesEditor.java index ba870790e50..56b5434941a 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BundlePropertiesEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BundlePropertiesEditor.java @@ -1,3 +1,16 @@ +/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.file; import java.io.File; @@ -42,12 +55,14 @@ public class BundlePropertiesEditor extends AbstractFileEditor { // } } + @Override public void createFiles(Set<String> files) { // TODO Auto-generated method stub } - public void save() { + @Override + protected void doSave() { // TODO Auto-generated method stub } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ClasspathEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ClasspathEditor.java index e16d91c449f..5ad206efb32 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ClasspathEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ClasspathEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -10,6 +9,7 @@ * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.file; @@ -27,14 +27,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.IAccessRule; -import org.eclipse.jdt.core.IClasspathAttribute; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.internal.core.ClasspathEntry; import org.eclipse.papyrus.eclipse.project.editors.Activator; import org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor; @@ -75,16 +71,7 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi } @Override - public void init() { - // nothing to do here - } - - /** - * save the modification - * - * @throws Throwable - */ - public void save() { + protected void doSave() { try { this.javaProject.save(new NullProgressMonitor(), true); } catch (JavaModelException ex) { @@ -92,29 +79,26 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi } } + @Override + public void addSourceFolderToClasspath(final String folderPath) { + addSourceFolderToClasspath(folderPath, null); + } + /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor#addSourceFolderToClasspath(java.lang.String) - * - * {@inheritDoc} + * @since 2.0 */ - public void addSourceFolderToClasspath(final String folderPath) { + @Override + public void addSourceFolderToClasspath(final String srcPath, final String binPath) { - if (exists() && !isSourceFolderRegistered(folderPath)) { + if (exists() && !isSourceFolderRegistered(srcPath)) { + touch(); // parameters for the new ClasspathEntry - boolean isExported = false; IPath[] exclusionPatterns = new IPath[0]; - IPath sourceAttachmentPath = null; - IPath specificOutputLocation = null; - boolean combineAccessRules = false; - IClasspathAttribute[] extraAttributes = new IClasspathAttribute[0]; - IPath sourceAttachmentRootPath = null; - IAccessRule[] accessRules = null; - int contentKind = IPackageFragmentRoot.K_SOURCE; - IPath[] inclusionPatterns = new IPath[0]; - int entryKind = IClasspathEntry.CPE_SOURCE; - IPath path2 = new Path(folderPath); + IPath absoluteSourcePath = javaProject.getPath().append(srcPath).addTrailingSeparator(); + IPath specificOutputLocation = (binPath == null) + ? null + : javaProject.getPath().append(binPath).addTrailingSeparator(); IClasspathEntry[] classpathes = null; try { @@ -127,8 +111,10 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi for (int i = 0; i < classpathes.length; i++) { entries[i] = classpathes[i]; } - entries[classpathes.length] = new ClasspathEntry(contentKind, entryKind, path2, inclusionPatterns, exclusionPatterns, sourceAttachmentPath, sourceAttachmentRootPath, specificOutputLocation, isExported, accessRules, combineAccessRules, - extraAttributes); + entries[classpathes.length] = JavaCore.newSourceEntry( + absoluteSourcePath, + exclusionPatterns, + specificOutputLocation); try { this.javaProject.setRawClasspath(entries, new NullProgressMonitor()); } catch (JavaModelException e) { @@ -137,24 +123,20 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor#isSourceFolderRegistered(java.lang.String) - * - * {@inheritDoc} - */ + @Override public boolean isSourceFolderRegistered(final String folderPath) { IClasspathEntry[] entries = null; try { entries = this.javaProject.getRawClasspath(); } catch (JavaModelException e) { Activator.log.error(e); + return false; } for (int i = 0; i < entries.length; i++) { IClasspathEntry entry = entries[i]; if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) { - if (entry.getPath().equals(new Path(folderPath))) { + if (entry.getPath().makeRelativeTo(javaProject.getPath()).equals(new Path(folderPath))) { return true; } } @@ -175,12 +157,6 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi return classpath.exists(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingFiles() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingFiles() { Set<String> files = super.getMissingFiles(); @@ -191,12 +167,7 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi return files; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#createFiles(Set) - * - * {@inheritDoc} - */ + @Override public void createFiles(final Set<String> files) { if (files.contains(CLASSPATH_FILE)) { IFile classpath = getProject().getFile(CLASSPATH_FILE); @@ -212,6 +183,7 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi } } + @Override public String[] getSourceFolders() { List<String> sourceFolders = new LinkedList<String>(); IClasspathEntry[] entries = null; @@ -231,6 +203,7 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi return sourceFolders.toArray(new String[sourceFolders.size()]); } + @Override public String[] getBinFolders() { List<String> binFolders = new LinkedList<String>(); try { @@ -251,7 +224,7 @@ public class ClasspathEditor extends AbstractFileEditor implements IClasspathEdi if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) { if (entry.getOutputLocation() != null) { // Bin folder associated to each source folder - binFolders.add(entry.getOutputLocation().makeRelativeTo(javaProject.getPath()).toString()); + binFolders.add(entry.getOutputLocation().makeRelativeTo(javaProject.getPath()).removeTrailingSeparator().toString()); } } } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ManifestEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ManifestEditor.java index 91767d21074..253eba79c47 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ManifestEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ManifestEditor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,8 @@ * * Contributors: * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.file; @@ -15,19 +17,34 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.Set; +import java.util.function.BiFunction; +import java.util.function.Predicate; import java.util.jar.Attributes; -import java.util.jar.Attributes.Name; import java.util.jar.Manifest; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.papyrus.eclipse.project.editors.Activator; import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; import org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor; +import org.eclipse.pde.core.project.IBundleProjectService; +import org.eclipse.pde.core.project.IPackageImportDescription; +import org.eclipse.pde.core.project.IRequiredBundleDescription; public class ManifestEditor extends ProjectEditor implements IManifestEditor { @@ -40,7 +57,12 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { private static final String COMMA = ","; //$NON-NLS-1$ - private static final String ASSIGN = "="; //$NON-NLS-1$ + // Pattern for splitting on commas that are not within version ranges + private static final String COMMA_SPLIT = ",(?!\\s*\\d)"; //$NON-NLS-1$ + + private static final String EQUALS = "="; //$NON-NLS-1$ + + private static final String ASSIGN = ":="; //$NON-NLS-1$ private static final String BUNDLE_SYMBOLIC_NAME = "Bundle-SymbolicName"; //$NON-NLS-1$ @@ -50,11 +72,17 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { private static final String SINGLETON = "singleton:="; //$NON-NLS-1$ + private static final String VISIBILITY = "visibility"; //$NON-NLS-1$ + + private static final String REEXPORT = "reexport"; //$NON-NLS-1$ + + private static final String VERSION = "version"; //$NON-NLS-1$ + /** the manifest file */ private IFile manifestFile; /** the manifest itself */ - private Manifest manifest; + private Optional<Manifest> manifest = Optional.empty(); /** * @@ -68,36 +96,18 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { super(project); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#initOk() - * - * {@inheritDoc} - */ public boolean initOk() { - return manifest != null && manifestFile != null; + return manifest.isPresent() && (manifestFile != null); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addDependency(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void addDependency(final String dependency) { addDependency(dependency, null); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#init() - * - * {@inheritDoc} - */ @Override public void init() { - super.init(); - if (manifest != null && manifestFile != null) { + if (initOk()) { return; } if (manifestFile == null) { @@ -105,7 +115,7 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { } if (manifestFile != null) { try { - manifest = new Manifest(manifestFile.getContents()); + manifest = Optional.of(new Manifest(manifestFile.getContents())); } catch (final IOException e) { Activator.log.error(e); // assure that exception is not silently captured (for users not examining the error log) @@ -119,124 +129,222 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addDependency(java.lang.String, java.lang.String) - * - * {@inheritDoc} - */ + @Override public void addDependency(final String dependency, final String version) { - final Name rqBundle = new Name(REQUIRED_BUNDLE); - String requireBundle = manifest.getMainAttributes().getValue(rqBundle); - - // TODO : Improve the detection of existing dependency - // If a.b.c exists, then a.b cannot be added (Because it is already contained) - // Moreover, the Manifest allows newlines anywhere (Including in the - // middle of a word) : check if these newlines appear in this map, - // or if they have already been parsed. If the manifest value is copied as-is in the map, - // then we need to take care of newlines when parsing it + if (hasDependency(dependency)) { + // Easy case: Just update the version + Map<String, String> attributes = (version == null) + ? null + : Collections.singletonMap("bundle-version", version); //$NON-NLS-1$ + updateDependencies(dependency::equals, attributes, null); + } else { + // Only slightly more difficult case: Add the new dependency + String newDependency = (version == null) + ? dependency + : String.format("%s;bundle-version=\"%s\"", dependency, version); //$NON-NLS-1$ - if (requireBundle == null) { - requireBundle = dependency; + String requireBundle = getMainAttribute(REQUIRED_BUNDLE) + .map(rb -> rb + COMMA + newDependency) + .orElse(newDependency); - if (version != null) { - requireBundle += SEMICOLON + "bundle-version=\"" + version + "\""; - } - } else if (!requireBundle.contains(dependency)) { - requireBundle += COMMA + dependency; - // TODO: Update version + setMainAttribute(REQUIRED_BUNDLE, requireBundle); } + } - manifest.getMainAttributes().put(rqBundle, requireBundle); + @Override + public boolean hasDependency(final String dependency) { + // Match a dependency if it is + // (a) preceded by another dependency or the beginning of the input, AND + // (b) followed by another dependency or an attribute/directive or the end of the input + Pattern namePattern = Pattern.compile(String.format("(?<=^|,)\\Q%s\\E(?=,|;|$)", dependency)); //$NON-NLS-1$ + return getMainAttribute(REQUIRED_BUNDLE) + .map(rb -> namePattern.matcher(rb).find()) // $NON-NLS-1$ + .orElse(false); } /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#hasDependency(java.lang.String) - * - * {@inheritDoc} + * @since 2.0 */ - public boolean hasDependency(final String dependency) { - final Name rqBundle = new Name(REQUIRED_BUNDLE); - String requireBundle = manifest.getMainAttributes().getValue(rqBundle); - return requireBundle != null && requireBundle.contains(dependency); + public boolean hasPackage(final String packageName, final String type) { + // Match a package if it is + // (a) preceded by another dependency or the beginning of the input, AND + // (b) followed by another dependency or an attribute/directive or the end of the input + Pattern namePattern = Pattern.compile(String.format("(?<=^|,)\\Q%s\\E(?=,|;|$)", packageName)); //$NON-NLS-1$ + return getMainAttribute(type) + .map(ip -> namePattern.matcher(ip).find()) // $NON-NLS-1$ + .orElse(false); } + @Override + @Deprecated public void setDependenciesVersion(final String dependencyPattern, final String newVersion) { - final Name rqBundle = new Name(REQUIRED_BUNDLE); - final String requireBundles = manifest.getMainAttributes().getValue(rqBundle); - final String[] bundles = requireBundles.split(COMMA); - String newRequiredBundles = ""; //$NON-NLS-1$ - for (int ii = 0; ii < bundles.length; ii++) {// we iterate on the declared dependencies - final String currentDependency = bundles[ii]; - final String[] dependencyValue = currentDependency.split(SEMICOLON); - if (dependencyValue[0].contains(dependencyPattern)) { - final String newBundleVersion = BUNDLE_VERSION + ASSIGN + '"' + newVersion + '"'; - newRequiredBundles += dependencyValue[0] + SEMICOLON + newBundleVersion; - for (int i = 1; i < dependencyValue.length; i++) { - final String declaration = dependencyValue[i]; - if (declaration.contains(BUNDLE_VERSION + ASSIGN)) { - // we ignore it - } else { - newRequiredBundles += SEMICOLON + dependencyValue[i];// we add the others declaration + updateDependencies( + name -> name.contains(dependencyPattern), // Update dependencies like this + Collections.singletonMap("bundle-version", newVersion), // To have this version attribute + null); // And don't change directives such as optionality + } + + private void updateDependencies(Predicate<String> predicate, Map<String, String> attributes, Map<String, String> directives) { + updateHeader(REQUIRED_BUNDLE, predicate, attributes, directives); + } + + private void updatePackages(Predicate<String> predicate, String type, Map<String, String> attributes, Map<String, String> directives) { + updateHeader(type, predicate, attributes, directives); + } + + private void updateHeader(String headerName, Predicate<String> predicate, Map<String, String> attributes, Map<String, String> directives) { + // Match an attribute or directive, capturing: + // 1 - the attribute/directive name + // 2 - the equality/assignment operator + // 3 - the quotation delimiter, if any + Pattern attributeOrDirective = Pattern.compile("([^:]+)(:?=)([\"']?).*\\3"); + + transformHeader(headerName, predicate, (dependency, attrs) -> { + StringBuilder result = new StringBuilder(); + + Map<String, String> newAttributes = (attributes == null) ? Collections.emptyMap() : new HashMap<>(attributes); + Map<String, String> newDirectives = (directives == null) ? Collections.emptyMap() : new HashMap<>(directives); + result.append(dependency); + + for (String next : attrs) { + Matcher m = attributeOrDirective.matcher(next); + + if (!m.matches()) { + // Unexpected formulation. Just append it as is + result.append(SEMICOLON).append(next); + } else { + String name = m.group(1); + boolean explicit = newAttributes.containsKey(name) || newDirectives.containsKey(name); + String value = newAttributes.remove(name); + if (value == null) { + value = newDirectives.remove(name); } + + if (value != null) { + // Replace this attribute or directive + result.append(SEMICOLON); + result.append(name).append(m.group(2)); + result.append(m.group(3)).append(value).append(m.group(3)); + } else if (!explicit) { + // Just append it as is + result.append(SEMICOLON).append(m.group()); + } // else an explicit null value: remove the attribute or directive } - } else { - newRequiredBundles += currentDependency;// we copy the existing declaration } - if (ii < bundles.length - 1) { - newRequiredBundles += COMMA; + + // Left-overs + for (Map.Entry<String, String> next : newAttributes.entrySet()) { + result.append(SEMICOLON); + result.append(next.getKey()).append(EQUALS).append('"').append(next.getValue()).append('"'); + } + for (Map.Entry<String, String> next : newDirectives.entrySet()) { + result.append(SEMICOLON); + result.append(next.getKey()).append(ASSIGN).append(next.getValue()); + } + + return result.toString(); + }); + } + + private void transformDependencies(Predicate<String> predicate, BiFunction<String, List<String>, String> transformation) { + transformHeader(REQUIRED_BUNDLE, predicate, transformation); + } + + private void transformImportedPackages(Predicate<String> predicate, BiFunction<String, List<String>, String> transformation) { + transformHeader(IMPORT_PACKAGE, predicate, transformation); + } + + private void transformHeader(String headerName, Predicate<String> predicate, BiFunction<String, List<String>, String> transformation) { + final String entryList = getMainAttribute(headerName).orElse(""); //$NON-NLS-1$ + final String[] entries = entryList.isEmpty() ? new String[0] : entryList.split(COMMA_SPLIT); + StringBuilder newEntryList = new StringBuilder(); + for (int i = 0; i < entries.length; i++) {// we iterate on the declared dependencies + String entry = entries[i]; + List<String> parts = Arrays.asList(entry.split(SEMICOLON)); + String dependencyName = parts.get(0); + + if (!predicate.test(dependencyName)) { + // Retain this one as is + if (newEntryList.length() > 0) { + newEntryList.append(COMMA); + } + newEntryList.append(entry); + } else { + String transformed = transformation.apply(dependencyName, parts.subList(1, parts.size())); + if (transformed != null) { + if (newEntryList.length() > 0) { + newEntryList.append(COMMA); + } + newEntryList.append(transformed); + } } } - setValue(REQUIRED_BUNDLE, newRequiredBundles); + setMainAttribute(headerName, (newEntryList.length() == 0) ? null : newEntryList.toString()); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setValue(java.lang.String, java.lang.String) - * - * {@inheritDoc} - */ + @Override public void setValue(final String key, final String value) { - setValue(key, "", value); //$NON-NLS-1$ + setMainAttribute(key, value); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setValue(java.lang.String, java.lang.String, java.lang.String) - * - * {@inheritDoc} - */ + @Override public void setValue(final String key, final String name, final String value) { - manifest.getMainAttributes().putValue(key, value); - // this.manifest.getAttributes(key).put(name, value); + setAttribute(key, name, value); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#removeValue(java.lang.String, java.lang.String) - * - * {@inheritDoc} - */ - public void removeValue(final String key, final String value) { + void setMainAttribute(String name, String value) { + if (value == null) { + removeMainAttribute(name); + } else { + manifest.map(Manifest::getMainAttributes).ifPresent(attrs -> { + if (!Objects.equals(attrs.getValue(name), value)) { + touch(); + attrs.putValue(name, value); + } + }); + } + } + void setAttribute(String section, String name, String value) { + if (value == null) { + removeAttribute(section, name); + } else { + manifest.map(m -> m.getAttributes(section)).ifPresent(attrs -> { + if (!Objects.equals(attrs.getValue(name), value)) { + touch(); + attrs.putValue(name, value); + } + }); + } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#removeValue(java.lang.String) - * - * {@inheritDoc} - */ + @Override + public void removeValue(final String section, final String name) { + removeAttribute(section, name); + } + + @Override public void removeValue(final String key) { - manifest.getAttributes(key).remove(key); + removeMainAttribute(key); + } + + void removeMainAttribute(String name) { + manifest.map(m -> m.getMainAttributes()).ifPresent(attrs -> { + if (attrs.remove(new Attributes.Name(name)) != null) { + touch(); + } + }); + } + + void removeAttribute(String section, String name) { + manifest.map(m -> m.getAttributes(section)).ifPresent(attrs -> { + if (attrs.remove(new Attributes.Name(name)) != null) { + touch(); + } + }); } - /** - * - * @return - */ private IFile getManifestFile() { final IFile manifest = getProject().getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$ if (manifest.exists()) { @@ -245,44 +353,36 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { return null; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#exists() - * - * {@inheritDoc} - */ @Override public boolean exists() { return super.exists() && getManifestFile() != null && getSymbolicBundleName() != null && getBundleVersion() != null; } /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#save() - * - * {@inheritDoc} + * @since 2.0 */ @Override - public void save() { - - final ByteArrayOutputStream os = new ByteArrayOutputStream(); + protected void doSave() { + if (manifest.isPresent()) { + final ByteArrayOutputStream os = new ByteArrayOutputStream(); - try { - manifest.write(os); + try { + manifest.get().write(os); - final StringReader reader = new StringReader(format(os.toString("UTF-8"))); //$NON-NLS-1$ - manifestFile.setContents(new InputStream() { + final StringReader reader = new StringReader(format(os.toString("UTF-8"))); //$NON-NLS-1$ + manifestFile.setContents(new InputStream() { - @Override - public int read() throws IOException { - return reader.read(); - } - }, true, true, null); + @Override + public int read() throws IOException { + return reader.read(); + } + }, true, true, null); - } catch (final IOException ex) { - Activator.log.error(ex); - } catch (final CoreException ex) { - Activator.log.error(ex); + } catch (final IOException ex) { + Activator.log.error(ex); + } catch (final CoreException ex) { + Activator.log.error(ex); + } } } @@ -297,8 +397,8 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { for (String line : lines) { non72safe += line; } - // 2. split lines on comma - lines = non72safe.split(COMMA); + // 2. split lines on comma (but not within version ranges) + lines = non72safe.split(",(?!\\s*\\d)"); String newText = ""; //$NON-NLS-1$ for (int i = 0; i < lines.length; i++) { newText += lines[i].trim(); @@ -319,19 +419,13 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { return files; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#createFiles(java.util.Set) - * - * {@inheritDoc} - */ @Override public void createFiles(final Set<String> files) { if (files.contains(MANIFEST_PATH)) { manifestFile = getProject().getFile(MANIFEST_PATH); if (!manifestFile.exists()) { try { - final String input = "Manifest-Version: 1.0\n"; //without the "/n", it doesn't work!!!!! //$NON-NLS-1$ + final String input = "Manifest-Version: 1.0\n"; // without the "/n", it doesn't work!!!!! //$NON-NLS-1$ if (!manifestFile.getParent().exists()) { final IContainer parent = manifestFile.getParent(); if (parent instanceof IFolder) { @@ -354,162 +448,106 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { Activator.log.error(ex); } } - } - try { - manifest = new Manifest(manifestFile.getContents()); - } catch (IOException e) { - Activator.log.error(e); - } catch (CoreException e) { - Activator.log.error(e); - } + try (InputStream contents = manifestFile.getContents()) { + manifest = Optional.of(new Manifest(contents)); + } catch (IOException e) { + Activator.log.error(e); + } catch (CoreException e) { + Activator.log.error(e); + } - if (getSymbolicBundleName() == null) { - setSymbolicBundleName(getProject().getName()); - } + if (getSymbolicBundleName() == null) { + setSymbolicBundleName(getProject().getName()); + } - if (getBundleVersion() == null) { - setBundleVersion("0.0.1"); //$NON-NLS-1$ + if (getBundleVersion() == null) { + setBundleVersion("0.0.1"); //$NON-NLS-1$ + } } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setSymbolicBundleName(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void setSymbolicBundleName(String newName) { if (newName == null) { newName = "noName"; //$NON-NLS-1$ } - final Name symbolicName = new Name(BUNDLE_SYMBOLIC_NAME); - manifest.getMainAttributes().put(symbolicName, newName); + setMainAttribute(BUNDLE_SYMBOLIC_NAME, newName); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#getSymbolicBundleName() - * - * {@inheritDoc} - */ + @Override public String getSymbolicBundleName() { - if (manifest != null) { - final Name symbolicName = new Name(BUNDLE_SYMBOLIC_NAME); - final String name = manifest.getMainAttributes().getValue(symbolicName); - - if (name != null) { - int semiColon = name.indexOf(SEMICOLON); - return semiColon != -1 ? name.substring(0, semiColon) : name; - } - } - - return null; + // Without the <String> hint, javac balks but JDT does not + return getMainAttribute(BUNDLE_SYMBOLIC_NAME) + .<String> map(name -> { + int semiColon = name.indexOf(SEMICOLON); + return semiColon >= 0 ? name.substring(0, semiColon) : name; + }).orElse(null); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#getBundleVersion() - * - * {@inheritDoc} - */ + @Override public String getBundleVersion() { - if (manifest != null) { - final Name symbolicName = new Name(BUNDLE_VERSION); - final String version = manifest.getMainAttributes().getValue(symbolicName); - return version; - } - return null; + return getMainAttribute(BUNDLE_VERSION).orElse(null); } - /** - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setBundleVersion(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void setBundleVersion(final String version) { - if (manifest != null) { - final Name bundleVersion = new Name(BUNDLE_VERSION); - if (version == null) { - manifest.getMainAttributes().remove(bundleVersion); - } else { - manifest.getMainAttributes().put(bundleVersion, version); - } - } + setMainAttribute(BUNDLE_VERSION, version); } - /** - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#getBundleVendor() - * - * {@inheritDoc} - */ + @Override public String getBundleVendor() { - if (manifest != null) { - final Name bundleVendor = new Name(BUNDLE_VENDOR); - return manifest.getMainAttributes().getValue(bundleVendor); - } - return null; + return getMainAttribute(BUNDLE_VENDOR).orElse(null); + } + + @Override + public void setBundleVendor(final String vendor) { + setMainAttribute(BUNDLE_VENDOR, vendor); + } + + @Override + public String getValue(final String name) { + return getMainAttribute(name).orElse(null); } /** - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setBundleVendor(java.lang.String) - * - * {@inheritDoc} + * @since 2.0 */ - public void setBundleVendor(final String vendor) { - if (manifest != null) { - final Name bundleVendor = new Name(BUNDLE_VENDOR); - if (vendor == null) { - manifest.getMainAttributes().remove(bundleVendor); - } else { - manifest.getMainAttributes().put(bundleVendor, vendor); - } - } + @Override + public String getValue(String key, String name) { + return getAttribute(key, name).orElse(null); } - public String getValue(final String key) { - if (manifest != null) { - String value = manifest.getMainAttributes().getValue(key); - if (value == null) { - final Attributes attributes = manifest.getAttributes(key); - if (attributes != null) { - value = attributes.getValue(key); - } - } - return value; - } - return null; + Optional<String> getMainAttribute(String name) { + return manifest.map(Manifest::getMainAttributes).map(attrs -> attrs.getValue(name)); + } + + Optional<String> getAttribute(String section, String name) { + return manifest.map(m -> m.getAttributes(section)).map(attrs -> attrs.getValue(name)); } + @Override public String getBundleName() { - if (manifest != null) { - final Name bundleName = new Name(BUNDLE_NAME); - final String name = manifest.getMainAttributes().getValue(bundleName); - return name; - } - return null; + return getMainAttribute(BUNDLE_NAME).orElse(null); } + @Override public void setBundleName(String newName) { if (newName == null) { newName = "noName"; //$NON-NLS-1$ } - final Name bundleNameName = new Name(BUNDLE_NAME); - manifest.getMainAttributes().put(bundleNameName, newName); + setMainAttribute(BUNDLE_NAME, newName); } + @Override public String getBundleLocalization() { - if (manifest != null) { - final Name bundleLocalization = new Name(BUNDLE_LOCALIZATION); - final String name = manifest.getMainAttributes().getValue(bundleLocalization); - return name; - } - return null; + return getMainAttribute(BUNDLE_LOCALIZATION).orElse(null); } + @Override public void setSingleton(final boolean singleton) { - String value = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLIC_NAME); - final String[] directives = value.split(SEMICOLON); + String value = getMainAttribute(BUNDLE_SYMBOLIC_NAME).orElse(""); //$NON-NLS-1$ + final String[] directives = value.isEmpty() ? new String[0] : value.split(SEMICOLON); if (directives.length == 0) { return; // This should not happen if the Manifest is well-formed @@ -529,18 +567,24 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { } } - manifest.getMainAttributes().putValue(BUNDLE_SYMBOLIC_NAME, value); + setMainAttribute(BUNDLE_SYMBOLIC_NAME, value); } /** * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String) * * @param packageName + * @since 2.0 */ + @Override public void addImportPackage(String packageName) { addImportPackage(packageName, null); } + /** + * @since 2.0 + */ + @Override public void addImportPackage(String packageName, String version) { addPackage(packageName, IMPORT_PACKAGE, version); } @@ -549,7 +593,9 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String) * * @param packageName + * @since 2.0 */ + @Override public void addExportPackage(String packageName) { addExportPackage(packageName, null); } @@ -560,7 +606,9 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { * * @param packageName * @param version + * @since 2.0 */ + @Override public void addExportPackage(String packageName, String version) { addPackage(packageName, EXPORT_PACKAGE, version); } @@ -568,27 +616,144 @@ public class ManifestEditor extends ProjectEditor implements IManifestEditor { /** * Adds a package name in a manifest header type. * - * @param packageName the package name to add - * @param type IMPORT_PACKAGE or EXPORT_PACKAGE + * @param packageName + * the package name to add + * @param type + * IMPORT_PACKAGE or EXPORT_PACKAGE */ private void addPackage(String packageName, String type, String version) { - final Name manifestHeader = new Name(type); - String manifestHeaderValue = manifest.getMainAttributes().getValue(manifestHeader); + if (hasPackage(packageName, type)) { + // Easy case: Just update the version + Map<String, String> attributes = (version == null) + ? null + : Collections.singletonMap(VERSION, version); // $NON-NLS-1$ + updatePackages(packageName::equals, type, attributes, null); + } else { + // Only slightly more difficult case: Add the new import + String newPackage = (version == null) + ? packageName + : String.format("%s;version=\"%s\"", packageName, version); //$NON-NLS-1$ - // TODO: Same as addDependency(final String, final String) : Improve the detection of existing packages + String importPackage = getMainAttribute(type) + .map(ip -> ip + COMMA + newPackage) + .orElse(newPackage); - if (manifestHeaderValue == null) { - manifestHeaderValue = packageName; + setMainAttribute(type, importPackage); + } + } - if (version != null) { - manifestHeaderValue += SEMICOLON + "version=\"" + version + "\""; + /** + * @since 2.0 + */ + @Override + public List<IRequiredBundleDescription> getRequiredBundles() { + List<IRequiredBundleDescription> result = new ArrayList<>(); + + Pattern versionPattern = Pattern.compile("bundle-version=([\"']?)(.*)\\1"); //$NON-NLS-1$ + Pattern optionalPattern = Pattern.compile("resolution:?=([\"']?)optional\\1"); //$NON-NLS-1$ + Pattern reexportPattern = Pattern.compile("visibility:?=([\"']?)reexport\\1"); //$NON-NLS-1$ + + IBundleProjectService service = Activator.getDefault().getBundleProjectService(); + String requireBundles = getMainAttribute(REQUIRED_BUNDLE).orElse(""); //$NON-NLS-1$ + String[] bundles = requireBundles.isEmpty() ? new String[0] : requireBundles.split(COMMA_SPLIT); + + for (int i = 0; i < bundles.length; i++) { + String dependency = bundles[i]; + String[] parts = dependency.split(SEMICOLON); + + String name = parts[0]; + VersionRange version = VersionRange.emptyRange; + boolean optional = false; + boolean reexported = false; + + for (int j = 1; j < parts.length; j++) { + Matcher m = versionPattern.matcher(parts[j]); + if (m.matches()) { + version = new VersionRange(m.group(2)); + } else { + m = optionalPattern.matcher(parts[j]); + if (m.matches()) { + optional = true; + } else { + m = reexportPattern.matcher(parts[j]); + if (m.matches()) { + reexported = true; + } + } + } + } + + result.add(service.newRequiredBundle(name, version, optional, reexported)); + } + + return result; + } + + /** + * @since 2.0 + */ + @Override + public List<IPackageImportDescription> getImportedPackages() { + List<IPackageImportDescription> result = new ArrayList<>(); + + Pattern versionPattern = Pattern.compile("version=([\"']?)(.*)\\1"); //$NON-NLS-1$ + Pattern optionalPattern = Pattern.compile("resolution:?=([\"']?)optional\\1"); //$NON-NLS-1$ + + IBundleProjectService service = Activator.getDefault().getBundleProjectService(); + String importedPackages = getMainAttribute(IMPORT_PACKAGE).orElse(""); //$NON-NLS-1$ + String[] packages = importedPackages.isEmpty() ? new String[0] : importedPackages.split(COMMA_SPLIT); + + for (int i = 0; i < packages.length; i++) { + String package_ = packages[i]; + String[] parts = package_.split(SEMICOLON); + + String name = parts[0]; + VersionRange version = VersionRange.emptyRange; + boolean optional = false; + + for (int j = 1; j < parts.length; j++) { + Matcher m = versionPattern.matcher(parts[j]); + if (m.matches()) { + version = new VersionRange(m.group(2)); + } else { + m = optionalPattern.matcher(parts[j]); + if (m.matches()) { + optional = true; + } + } } - } else if (!manifestHeaderValue.contains(packageName)) { - manifestHeaderValue += COMMA + packageName; - // TODO: Update version + result.add(service.newPackageImport(name, version, optional)); } - manifest.getMainAttributes().put(manifestHeader, manifestHeaderValue); + return result; + } + + + /** + * @since 2.0 + */ + @Override + public void setRequiredBundleExported(String bundleName, boolean exported) { + updateDependencies( + bundleName::equals, // Update bundles having this name + null, // Don't change attributes such as version + Collections.singletonMap(VISIBILITY, exported ? REEXPORT : null)); // Set the visibility directive + } + + /** + * @since 2.0 + */ + @Override + public void removeRequiredBundle(String bundleName) { + transformDependencies(bundleName::equals, (dep, parts) -> null); + } + + /** + * @since 2.0 + */ + @Override + public void removeImportedPackage(String packageName) { + transformImportedPackages(packageName::equals, (dep, parts) -> null); } } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java index 960e018af6e..bf65ae957fc 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java @@ -17,7 +17,9 @@ package org.eclipse.papyrus.eclipse.project.editors.interfaces; /** * * Editor for the build.properties - * + * + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ public interface IBuildEditor extends IFileEditor { @@ -84,7 +86,7 @@ public interface IBuildEditor extends IFileEditor { * Returns all the registered source folders * * @return - * all the registered source folders + * all the registered source folders */ public String[] getSourceFolders(); @@ -92,7 +94,7 @@ public interface IBuildEditor extends IFileEditor { * Returns all the files added to the build * * @return - * all the files added to the build + * all the files added to the build */ public String[] getElementsInBuild(); } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IClasspathEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IClasspathEditor.java index e8921a045a1..e701d5faf07 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IClasspathEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IClasspathEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -10,6 +9,7 @@ * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.interfaces; @@ -18,7 +18,9 @@ package org.eclipse.papyrus.eclipse.project.editors.interfaces; /** * * This interface for the file .classpath - * + * + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ public interface IClasspathEditor extends IFileEditor { @@ -26,19 +28,32 @@ public interface IClasspathEditor extends IFileEditor { public static final String CLASSPATH_FILE = ".classpath"; //$NON-NLS-1$ /** - * add a source folder to the class path + * Add a source folder to the class path. * * @param folderPath + * a folder path relative to the project path */ public void addSourceFolderToClasspath(final String folderPath); /** - * Tests if a folder is already registered in the classpath + * Add a source folder with optional output folder to the class path. + * + * @param srcPath + * the source path relative to the project path (may not be {@code null}) + * @param binPath + * the output path relative to the project path (may be {@code null}) + * + * @since 2.0 + */ + public void addSourceFolderToClasspath(final String srcPath, final String binPath); + + /** + * Tests if a folder is already registered in the classpath. * * @param folderPath - * a folder path + * a folder path relative to the project path * @return - * <code>true</code> if the folderPath is already registered + * <code>true</code> if the folderPath is already registered */ public boolean isSourceFolderRegistered(final String folderPath); diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFeatureProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFeatureProjectEditor.java index f3ebd669f0e..45f3c4334a3 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFeatureProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFeatureProjectEditor.java @@ -1,16 +1,12 @@ package org.eclipse.papyrus.eclipse.project.editors.interfaces; -import java.util.Set; - import org.w3c.dom.Document; -public interface IFeatureProjectEditor { - - void init(); - - void save(); - - void createFiles(final Set<String> files); +/** + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. + */ +public interface IFeatureProjectEditor extends IProjectEditor { /** * Retrieves the feature.xml XML Document associated to this project. @@ -23,6 +19,7 @@ public interface IFeatureProjectEditor { * Gets the feature's id. * * @return the feature's id + * @since 2.0 */ String getId(); @@ -49,58 +46,132 @@ public interface IFeatureProjectEditor { /** * Gets the operating system of the feature + * * @return + * @since 2.0 */ String getOS(); + /** + * @since 2.0 + */ String getWS(); + /** + * @since 2.0 + */ String getNL(); + /** + * @since 2.0 + */ String getArch(); + /** + * @since 2.0 + */ String getDescriptionText(); + /** + * @since 2.0 + */ String getDescriptionURL(); + /** + * @since 2.0 + */ String getCopyrightText(); + /** + * @since 2.0 + */ String getCopyrightURL(); + /** + * @since 2.0 + */ String getLicenseText(); - String getLicenceURL(); + /** + * @since 2.0 + */ + String getLicenseURL(); + /** + * @since 2.0 + */ void setId(final String id); void setLabel(final String label); + /** + * @since 2.0 + */ void setVersion(final String version); + /** + * @since 2.0 + */ void setProviderName(final String providerName); + /** + * @since 2.0 + */ void setOS(final String os); + /** + * @since 2.0 + */ void setWS(final String ws); + /** + * @since 2.0 + */ void setNL(final String nl); + /** + * @since 2.0 + */ void setArch(final String arch); + /** + * @since 2.0 + */ void setDescription(final String descriptionURL, final String descriptionDesc); + /** + * @since 2.0 + */ void setCopyright(final String copyrightURL, final String copyrightDesc); + /** + * @since 2.0 + */ void setLicense(final String licenseURL, final String licenseDesc); + /** + * @since 2.0 + */ void setUpdateURL(final String urlLabel, final String url); + /** + * @since 2.0 + */ void addPlugin(final String pluginName); + /** + * @since 2.0 + */ void addRequiredFeature(final String featureName, final String version); + /** + * @since 2.0 + */ void addRequiredPlugin(String pluginName); + /** + * @since 2.0 + */ void addInclude(String featureName, String version); } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFileEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFileEditor.java index 89879fcba2f..c74cd754494 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFileEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFileEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +8,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.interfaces; @@ -20,7 +20,9 @@ import org.eclipse.core.resources.IProject; /** * * Interface to edit file - * + * + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ public interface IFileEditor { @@ -40,7 +42,7 @@ public interface IFileEditor { /** * * @return - * the missing files for the project + * the missing files for the project */ public Set<String> getMissingFiles(); @@ -51,15 +53,20 @@ public interface IFileEditor { */ public void createFiles(final Set<String> files); + /** + * Queries whether the editor has any unsaved changes. + * + * @since 2.0 + */ + public boolean isDirty(); - // TODO : Remove that "Throwable" exception... /** save the modification on the editor */ public void save(); /** * * @return - * the eclipse project + * the eclipse project */ public IProject getProject(); diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IJavaProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IJavaProjectEditor.java index 6a470f16208..73bd98dc743 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IJavaProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IJavaProjectEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +8,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.interfaces; @@ -16,9 +16,11 @@ package org.eclipse.papyrus.eclipse.project.editors.interfaces; /** * * Editor for the java project - * + * + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ -public interface IJavaProjectEditor extends IBuildEditor { +public interface IJavaProjectEditor extends IProjectEditor, IBuildEditor, IClasspathEditor { /** The java nature */ public static final String JAVA_NATURE = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$ @@ -34,19 +36,4 @@ public interface IJavaProjectEditor extends IBuildEditor { */ public void addJavaSourceFolder(final String path); - /** - * Gets the classpath editor. - * - * @return the classpath editor - */ - public IClasspathEditor getClasspathEditor(); - - - /** - * Gets the builds the editor. - * - * @return the builds the editor - */ - public IBuildEditor getBuildEditor(); - } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IManifestEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IManifestEditor.java index 7ffb9f48d01..73e5fef8183 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IManifestEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IManifestEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -10,16 +9,22 @@ * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.interfaces; +import java.util.List; +import org.eclipse.pde.core.project.IPackageImportDescription; +import org.eclipse.pde.core.project.IRequiredBundleDescription; /** * * Editor for the Manifest - * + * + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ public interface IManifestEditor extends IProjectEditor, IFileEditor { @@ -52,6 +57,7 @@ public interface IManifestEditor extends IProjectEditor, IFileEditor { /** * Add a dependency to the MANIFEST + * * @param dependency * the dependency to add */ @@ -76,45 +82,69 @@ public interface IManifestEditor extends IProjectEditor, IFileEditor { public boolean hasDependency(final String dependency); /** - * - * @param key - * the key + * Sets the value of a header in the main section of the manifest. + * + * @param name + * the header name * @param value - * the new value for the key + * the new value for the header */ - public void setValue(final String key, final String value); + public void setValue(final String name, final String value); - public String getValue(final String key); + /** + * Queries the value of a header in the main section of the manifest. + * + * @param name + * the header name + * @return the value of the header, {@code null} if none + */ + public String getValue(final String name); /** - * + * Sets the value of an attribute in a named section of the manifest. + * * @param key - * the key + * the key (section name) * @param name - * the name + * the name of the attribute * @param value - * the new value for the key + * the new value for the attribute */ public void setValue(final String key, final String name, final String value); /** - * + * Queries the value of a header in a named section of the manifest. + * * @param key - * the key - * @param value - * the value to remove for this key + * the key (section name) + * @param name + * the header (attribute) name to set + * @return the value of the header, {@code null} if none + * + * @since 2.0 */ - public void removeValue(final String key, final String value); + public String getValue(final String key, String name); /** - * + * Removes a header from the main section of the manifest + * * @param key - * a key to remove from the manifest + * the header to remove from the manifest * */ public void removeValue(final String key); /** + * Removes an attribute in a named section of the manifest. + * + * @param key + * the key (section name) + * @param name + * the attribute to remove from this section + */ + public void removeValue(final String key, final String name); + + /** * * @param name * the symbolic name for the bundle @@ -125,14 +155,14 @@ public interface IManifestEditor extends IProjectEditor, IFileEditor { /** * * @return - * the bundle name for the project + * the bundle name for the project */ public String getSymbolicBundleName(); /** * * @return - * the symbolic bundle name for the project + * the symbolic bundle name for the project */ public String getBundleName(); @@ -146,7 +176,7 @@ public interface IManifestEditor extends IProjectEditor, IFileEditor { /** * * @return - * the version of the bundle + * the version of the bundle */ public String getBundleVersion(); @@ -159,7 +189,7 @@ public interface IManifestEditor extends IProjectEditor, IFileEditor { * Gets this plug-in's provider * * @return - * this plug-in's provider + * this plug-in's provider */ public String getBundleVendor(); @@ -175,7 +205,7 @@ public interface IManifestEditor extends IProjectEditor, IFileEditor { * Get the bundle localization * * @return - * the bundle localization + * the bundle localization */ public String getBundleLocalization(); @@ -193,37 +223,100 @@ public interface IManifestEditor extends IProjectEditor, IFileEditor { * the pattern for the dependency to update * @param newVersion * the version for the dependency + * + * @deprecated Bulk updates of the bundle dependencies are no longer policy since release 2.0. */ + @Deprecated public void setDependenciesVersion(final String dependencyPattern, final String newVersion); /** * Adds an import package to the MANIFEST. * - * @param packageName the package name to add + * @param packageName + * the package name to add + * @since 2.0 */ public void addImportPackage(String packageName); /** * Adds an import package and its version to the MANIFEST. * - * @param packageName the package name to add - * @param version the package version + * @param packageName + * the package name to add + * @param version + * the package version + * @since 2.0 */ public void addImportPackage(String packageName, String version); /** * Adds an export package to the MANFIEST. * - * @param packageName the package name to add + * @param packageName + * the package name to add + * @since 2.0 */ public void addExportPackage(String packageName); /** * Adds an export package and its version to the MANIFEST. * - * @param packageName the package name to add - * @param version the package version + * @param packageName + * the package name to add + * @param version + * the package version + * @since 2.0 */ public void addExportPackage(String packageName, String version); + /** + * Queries the existing bundle requirements. + * + * @return the existing <tt>Require-Bundle</tt> dependencies + * + * @since 2.0 + */ + public List<IRequiredBundleDescription> getRequiredBundles(); + + /** + * Queries the existing package imports. + * + * @return the existing <tt>Import-Package</tt> dependencies + * + * @since 2.0 + */ + public List<IPackageImportDescription> getImportedPackages(); + + /** + * Sets whether a <tt>Require-Bundle</tt> dependency is re-exported. + * + * @param bundleName + * the required bundle + * @param exported + * whether the required bundle is re-exported + * + * @since 2.0 + */ + public void setRequiredBundleExported(String bundleName, boolean exported); + + /** + * Removes a <tt>Require-Bundle</tt> dependency. + * + * @param bundleName + * the required bundle to remove + * + * @since 2.0 + */ + public void removeRequiredBundle(String bundleName); + + /** + * Removes an <tt>Import-package</tt> dependency. + * + * @param packageName + * the imported package to remove + * + * @since 2.0 + */ + public void removeImportedPackage(String packageName); + } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginEditor.java new file mode 100644 index 00000000000..e5a08490a86 --- /dev/null +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginEditor.java @@ -0,0 +1,29 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.interfaces; + +/** + * A synthesis of all of the editors required to manipulate the metadata + * of a plug-in bundle project. + * + * @since 2.0 + */ +public interface IPluginEditor extends IPluginProjectEditor, IJavaProjectEditor, IManifestEditor { + /** + * Queries whether the <tt>plugin.xml</tt> file, in particualr, exists. + * + * @return whether the plug-in manifest exists + */ + boolean pluginManifestExists(); +} diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginProjectEditor.java index 085ad042945..e05d2be0346 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginProjectEditor.java @@ -23,6 +23,8 @@ import org.w3c.dom.Node; * * Editor for the file plugin.xml * + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ public interface IPluginProjectEditor extends IProjectEditor, IFileEditor { diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IProjectEditor.java index 233c679d40a..e1fb920391b 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IProjectEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +8,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.interfaces; @@ -19,7 +19,9 @@ import java.util.Set; /** * * This interface defines the methods for the ProjectEditor - * + * + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ public interface IProjectEditor extends IFileEditor { @@ -46,23 +48,28 @@ public interface IProjectEditor extends IFileEditor { /** * * @return - * the missing nature for the project + * the missing nature for the project */ public Set<String> getMissingNature(); /** + * @since 2.0 + */ + public void addNatures(Set<String> natures); + + /** * * @param nature * a nature * @return - * <code>true</code> if the project has this nature + * <code>true</code> if the project has this nature */ public boolean hasNature(final String nature); /** * * @return - * the missing build command + * the missing build command */ public Set<String> getMissingBuildCommand(); @@ -78,7 +85,7 @@ public interface IProjectEditor extends IFileEditor { * @param command * a build command * @return - * <code>true</code> if the project has the build command + * <code>true</code> if the project has the build command */ public boolean hasBuildCommand(String command); diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/ProjectEditors.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/ProjectEditors.java new file mode 100644 index 00000000000..659ab73327e --- /dev/null +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/ProjectEditors.java @@ -0,0 +1,155 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.interfaces; + +import java.io.IOException; + +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.papyrus.eclipse.project.editors.Activator; +import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor; +import org.eclipse.papyrus.eclipse.project.editors.project.FeatureProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.project.JavaProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.project.PluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.project.PluginProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor; +import org.xml.sax.SAXException; + +/** + * Factory for access to editors for the various project metadata files supported + * by the framework. + * + * @since 2.0 + */ +public class ProjectEditors { + + /** + * Not instantiable by clients. + */ + private ProjectEditors() { + super(); + } + + /** + * Obtains an editor for all of the various metadata of a plug-in bundle project. + * + * @param project + * the project to edit + * @return the complete editor + * + * @throws CoreException + * on failure to create the editor (for example, if the project + * is not {@link IResource#isAccessible() accessible}) + */ + public static IPluginEditor getPluginEditor(IProject project) throws CoreException { + try { + return new PluginEditor(project); + } catch (ParserConfigurationException | SAXException | IOException e) { + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to create plugin.xml editor", e)); + } + } + + /** + * Obtains an editor for the <tt>.project</tt> file of a project. + * + * @param project + * the project to edit + * @return the <tt>.project</tt> editor + * + * @throws CoreException + * on failure to create the editor (for example, if the project + * is not {@link IResource#isAccessible() accessible}) + */ + public static IProjectEditor getProjectEditor(IProject project) throws CoreException { + return new ProjectEditor(project); + } + + /** + * Obtains an editor for the <tt>.project</tt>, <tt>.classpath</tt>, and + * <tt>build.properties</tt> files of a Java project. + * + * @param project + * the project to edit + * @return the Java project editor + * + * @throws CoreException + * on failure to create the editor (for example, if the project + * is not {@link IResource#isAccessible() accessible}) + */ + public static IJavaProjectEditor getJavaProjectEditor(IProject project) throws CoreException { + return new JavaProjectEditor(project); + } + + /** + * Obtains an editor for the <tt>plugin.xml</tt> file of a bundle project. + * + * @param project + * the project to edit + * @return the <tt>plugin.xml</tt> editor + * + * @throws CoreException + * on failure to create the editor (for example, if the project + * is not {@link IResource#isAccessible() accessible}) + */ + public static IPluginProjectEditor getPluginProjectEditor(IProject project) throws CoreException { + try { + return new PluginProjectEditor(project); + } catch (ParserConfigurationException | SAXException | IOException e) { + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to create plugin.xml editor", e)); + } + } + + /** + * Obtains an editor for the <tt>META-INF/MANIFEST</tt> file of a bundle project. + * + * @param project + * the project to edit + * @return the <tt>META-INF/MANIFEST.MF</tt> editor + * + * @throws CoreException + * on failure to create the editor (for example, if the project + * is not {@link IResource#isAccessible() accessible}) + */ + public static IManifestEditor getManifestEditor(IProject project) throws CoreException { + try { + return new ManifestEditor(project); + } catch (IOException e) { + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to create manifest editor", e)); + } + } + + /** + * Obtains an editor for the <tt>feature.xml</tt> file of a feature project. + * + * @param project + * the project to edit + * @return the <tt>feature.xml</tt> editor + * + * @throws CoreException + * on failure to create the editor (for example, if the project + * is not {@link IResource#isAccessible() accessible}) + */ + public static IFeatureProjectEditor getFeatureProjectEditor(IProject project) throws CoreException { + try { + return new FeatureProjectEditor(project); + } catch (ParserConfigurationException | SAXException | IOException e) { + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to create feature editor", e)); + } + } +} diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/AbstractProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/AbstractProjectEditor.java index e01a43355b0..a074a6a3297 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/AbstractProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/AbstractProjectEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +8,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.project; @@ -21,7 +21,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.eclipse.core.internal.events.BuildCommand; import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -59,24 +58,24 @@ public abstract class AbstractProjectEditor extends AbstractFileEditor implement this.description = getProject().getDescription(); } - /** + * Initializes me as a slave to another editor, which maintains the canonical + * project description. * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor.plugin.AbstractEditor#exists() - * - * {@inheritDoc} + * @param master + * my master editor */ + AbstractProjectEditor(AbstractProjectEditor master) { + super(master.getProject()); + + this.description = master.description; + } + @Override public boolean exists() { return super.exists() && getMissingNature().size() == 0 && getMissingBuildCommand().size() == 0; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#create() - * - * {@inheritDoc} - */ @Override public void create() { createFiles(getMissingFiles()); @@ -85,52 +84,37 @@ public abstract class AbstractProjectEditor extends AbstractFileEditor implement init(); } - /** - * - * @param nature - * a nature - * @return - * <code>true</code> if the project has the wanted nature - */ + @Override public boolean hasNature(final String nature) { List<String> natures = new LinkedList<String>(Arrays.asList(this.description.getNatureIds())); return natures.contains(nature); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingNature() - * - * {@inheritDoc} - */ + @Override public Set<String> getMissingNature() { return new HashSet<String>(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#addNatures(java.util.List) - * - * {@inheritDoc} - */ + @Override public void addNatures(final Set<String> natures) { List<String> existingNatures = new LinkedList<String>(Arrays.asList(this.description.getNatureIds())); + boolean added = false; Iterator<String> iter = natures.iterator(); while (iter.hasNext()) { String nature = iter.next(); if (!existingNatures.contains(nature)) { existingNatures.add(nature); + added = true; } } - this.description.setNatureIds(existingNatures.toArray(new String[existingNatures.size()])); + + if (added) { + touch(); + this.description.setNatureIds(existingNatures.toArray(new String[existingNatures.size()])); + } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#hasBuildCommand(java.lang.String) - * - * {@inheritDoc} - */ + @Override public boolean hasBuildCommand(final String command) { ICommand[] buildSpec = this.description.getBuildSpec(); for (int i = 0; i < buildSpec.length; i++) { @@ -141,38 +125,33 @@ public abstract class AbstractProjectEditor extends AbstractFileEditor implement return false; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#addBuildCommands(java.util.Set) - * - * {@inheritDoc} - */ + @Override public void addBuildCommands(final Set<String> commands) { ICommand[] buildSpec = this.description.getBuildSpec(); List<ICommand> buildSpecList = new ArrayList<ICommand>(); buildSpecList.addAll(Arrays.asList(buildSpec)); + boolean added = false; Iterator<String> iter = commands.iterator(); while (iter.hasNext()) { String name = iter.next(); if (!hasBuildCommand(name)) { - ICommand cmd = new BuildCommand(); + ICommand cmd = this.description.newCommand(); cmd.setBuilderName(name); buildSpecList.add(cmd); + added = true; } } - this.description.setBuildSpec(buildSpecList.toArray(new ICommand[buildSpecList.size()])); + + if (added) { + touch(); + this.description.setBuildSpec(buildSpecList.toArray(new ICommand[buildSpecList.size()])); + } } - /** - * - * @throws Throwable - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#save() - * - * {@inheritDoc} - */ - public void save() { + @Override + protected void doSave() { if (this.description != null) { try { getProject().setDescription(this.description, null); @@ -182,12 +161,7 @@ public abstract class AbstractProjectEditor extends AbstractFileEditor implement } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingBuildCommand() - * - * {@inheritDoc} - */ + @Override public Set<String> getMissingBuildCommand() { return new HashSet<String>(); } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/FeatureProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/FeatureProjectEditor.java index 9a828ba2622..b34b9e9ad68 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/FeatureProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/FeatureProjectEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +8,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.project; @@ -16,7 +16,7 @@ package org.eclipse.papyrus.eclipse.project.editors.project; import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; -import java.util.Collections; +import java.util.Objects; import java.util.Properties; import java.util.Set; @@ -43,8 +43,15 @@ import org.xml.sax.SAXException; public class FeatureProjectEditor extends ProjectEditor implements IFeatureProjectEditor { - /** the name of the file feature.xml */ - public static final String FRAGMENT_XML_FILE = "feature.xml"; //$NON-NLS-1$ + /** + * the name of the file feature.xml + * + * @since 2.0 + */ + public static final String FEATURE_XML_FILE = "feature.xml"; //$NON-NLS-1$ + + private static final String FEATURE_NATURE = "org.eclipse.pde.FeatureNature"; //$NON-NLS-1$ + private static final String FEATURE_BUILDER = "org.eclipse.pde.FeatureBuilder"; //$NON-NLS-1$ private static final String ID = "id"; //$NON-NLS-1$ private static final String LABEL = "label"; //$NON-NLS-1$ @@ -68,18 +75,19 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje private static final String REQUIRES = "requires"; //$NON-NLS-1$ private static final String FEATURE = "feature"; //$NON-NLS-1$ - // TODO pour l'externalization : utiliser l'éditeur de Properties! dans java Utils + // TODO pour l'externalization : utiliser l'�diteur de Properties! dans java Utils - private Document fragmentXML; + private Document featureXML; - private IFile fragmentFile; + private IFile featureFile; - private Element fragmentRoot; + private Element featureRoot; /** * Constructor. * - * @param project the eclipse project + * @param project + * the eclipse project * @throws ParserConfigurationException * @throws SAXException * @throws IOException @@ -91,13 +99,13 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje @Override public void init() { - fragmentFile = getFeature(); - if (fragmentFile != null && fragmentFile.exists()) { + featureFile = getFeature(); + if ((featureFile != null) && featureFile.exists()) { final DocumentBuilderFactory documentFactory = DocumentBuilderFactory.newInstance(); try { DocumentBuilder documentBuilder = documentFactory.newDocumentBuilder(); - fragmentXML = documentBuilder.parse(fragmentFile.getLocation().toOSString()); - fragmentRoot = fragmentXML.getDocumentElement(); + featureXML = documentBuilder.parse(featureFile.getLocation().toOSString()); + featureRoot = featureXML.getDocumentElement(); } catch (final ParserConfigurationException e) { Activator.log.error(e); } catch (final SAXException e) { @@ -110,13 +118,13 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje @Override public void createFiles(final Set<String> files) { - if (files.contains(FRAGMENT_XML_FILE)) { - fragmentFile = getProject().getFile(FRAGMENT_XML_FILE); - if (!fragmentFile.exists()) { + if (files.contains(FEATURE_XML_FILE)) { + featureFile = getProject().getFile(FEATURE_XML_FILE); + if (!featureFile.exists()) { InputStream content = getInputStream("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<feature>\n</feature>\n\n"); //$NON-NLS-1$ try { - fragmentFile.create(content, true, null); + featureFile.create(content, true, null); } catch (CoreException e) { Activator.log.error(e); } @@ -129,93 +137,147 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje return getFeature().exists() && super.exists(); } - public void setAttribute(final Element element, final String attributeName, final String attributeValue) { - element.setAttribute(attributeName, attributeValue); + private void setAttribute(final String attributeName, final String attributeValue) { + setAttribute(featureRoot, attributeName, attributeValue); + } + + private void setAttribute(final Element element, final String attributeName, final String attributeValue) { + if (!Objects.equals(element.getAttribute(attributeName), attributeValue)) { + touch(); + element.setAttribute(attributeName, attributeValue); + } + } + + private void setTextContent(Element element, String text) { + if (!Objects.equals(element.getTextContent(), text)) { + touch(); + element.setTextContent(text); + } } /** * @return the feature.xml file if it exists */ private IFile getFeature() { - final IFile fragment = getProject().getFile(FRAGMENT_XML_FILE); + final IFile result = getProject().getFile(FEATURE_XML_FILE); - if (fragment.exists()) { - return fragment; + if (result.exists()) { + return result; } return null; } + /** + * @since 2.0 + */ @Override - public void save() { - if (exists()) { + protected void doSave() { + if ((featureFile != null) && featureFile.exists()) { try { final TransformerFactory transformerFactory = TransformerFactory.newInstance(); final Transformer transformer = transformerFactory.newTransformer(); transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$ final StreamResult result = new StreamResult(new StringWriter()); - final DOMSource source = new DOMSource(fragmentXML); + final DOMSource source = new DOMSource(featureXML); transformer.transform(source, result); final InputStream inputStream = getInputStream(result.getWriter().toString()); - fragmentFile.setContents(inputStream, true, true, null); + featureFile.setContents(inputStream, true, true, null); } catch (final TransformerException ex) { Activator.log.error(ex); } catch (final CoreException ex) { Activator.log.error(ex); } } - super.save(); + super.doSave(); } @Override public Set<String> getMissingNature() { - // TODO - return Collections.emptySet(); + Set<String> result = super.getMissingNature(); + if (!hasNature(FEATURE_NATURE)) { + result.add(FEATURE_NATURE); + } + return result; } @Override public Set<String> getMissingFiles() { - // TODO - return Collections.emptySet(); + Set<String> result = super.getMissingFiles(); + IFile feature = getProject().getFile(FEATURE_XML_FILE); + if (!feature.exists()) { + result.add(FEATURE_XML_FILE); + } + return result; } @Override public Set<String> getMissingBuildCommand() { - // TODO - return Collections.emptySet(); + Set<String> result = super.getMissingBuildCommand(); + if (!hasBuildCommand(FEATURE_BUILDER)) { + result.add(FEATURE_BUILDER); + } + return result; } + @Override public Document getDocument() { - return fragmentXML; + return featureXML; + } + + private String getAttribute(String name) { + return getAttribute(featureRoot, name); } + private String getAttribute(Element element, String name) { + return element.getAttribute(name); + } + + /** + * @since 2.0 + */ + @Override public String getId() { - return fragmentRoot.getAttribute(ID); + return getAttribute(ID); } + @Override public String getLabel() { - return fragmentRoot.getAttribute(LABEL); + return getAttribute(LABEL); } + @Override public String getVersion() { - return fragmentRoot.getAttribute(VERSION); + return getAttribute(VERSION); } + @Override public String getProviderName() { - return fragmentRoot.getAttribute(PROVIDER); + return getAttribute(PROVIDER); } + /** + * @since 2.0 + */ + @Override public String getDescriptionText() { - // TODO Auto-generated method stub - return null; + Element description = getNodeChild(DESCRIPTION, featureRoot); + return (description == null) ? null : description.getTextContent().trim(); } + /** + * @since 2.0 + */ + @Override public String getDescriptionURL() { - // TODO Auto-generated method stub - return null; + Element description = getNodeChild(DESCRIPTION, featureRoot); + return (description == null) || !description.hasAttribute(URL) + ? null + : description.getAttribute(URL); } + @Override public String getCopyrightURL() { final Element copyrightNode = getNode(COPYRIGHT); if (copyrightNode != null) { @@ -240,203 +302,239 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje return null; } + @Override public String getCopyrightText() { final Element copyrightNode = getNode(COPYRIGHT); return copyrightNode != null ? copyrightNode.getTextContent() : null; } + /** + * @since 2.0 + */ + @Override public String getLicenseText() { - // TODO Auto-generated method stub - return null; + Element license = getNodeChild(LICENSE, featureRoot); + return (license == null) + ? null + : license.getTextContent().trim(); } - public String getLicenceURL() { - // TODO Auto-generated method stub - return null; + /** + * @since 2.0 + */ + @Override + public String getLicenseURL() { + Element license = getNodeChild(LICENSE, featureRoot); + return (license == null) || !license.hasAttribute(URL) + ? null + : license.getAttribute(URL); } + /** + * @since 2.0 + */ + @Override public String getOS() { - return fragmentRoot.getAttribute(OS); + return getAttribute(OS); } + /** + * @since 2.0 + */ + @Override public String getWS() { - return fragmentRoot.getAttribute(WS); + return getAttribute(WS); } + /** + * @since 2.0 + */ + @Override public String getNL() { - return fragmentRoot.getAttribute(NL); + return getAttribute(NL); } + /** + * @since 2.0 + */ + @Override public String getArch() { - return fragmentRoot.getAttribute(ARCH); + return getAttribute(ARCH); } + /** + * @since 2.0 + */ + @Override public void setId(final String id) { - fragmentRoot.setAttribute(ID, id); + setAttribute(ID, id); } + @Override public void setLabel(final String label) { - fragmentRoot.setAttribute(LABEL, label); + setAttribute(LABEL, label); } + @Override public void setVersion(final String version) { - fragmentRoot.setAttribute(VERSION, version); + setAttribute(VERSION, version); } + @Override public void setProviderName(final String providerName) { - fragmentRoot.setAttribute(PROVIDER, providerName); + setAttribute(PROVIDER, providerName); } - public void setDescription(final String descriptionURL, final String description) { - if (exists()) { - Element extension = getNode(DESCRIPTION); + private Element forceElement(String name) { + return forceElement(featureRoot, name); + } - if (extension == null) { - extension = fragmentXML.createElement(DESCRIPTION); - fragmentRoot.appendChild(extension); - } + private Element forceElement(Element parent, String name) { + Element result = getNodeChild(name, parent); + if (result == null) { + touch(); + result = createElement(name); + parent.appendChild(result); + } + return result; + } - extension.setAttribute(URL, descriptionURL); - extension.setTextContent(description); + @Override + public void setDescription(final String descriptionURL, final String description) { + if (featureRoot != null) { + Element extension = forceElement(DESCRIPTION); + setAttribute(extension, URL, descriptionURL); + setTextContent(extension, description); } } + @Override public void setCopyright(final String copyrightURL, final String copyrightDesc) { setURLNode(COPYRIGHT, copyrightURL, copyrightDesc); } + /** + * @since 2.0 + */ + @Override public void setLicense(final String licenseURL, final String licenseDesc) { setURLNode(LICENSE, licenseURL, licenseDesc); } + /** + * @since 2.0 + */ + @Override public void setOS(final String os) { - fragmentRoot.setAttribute(OS, os); + setAttribute(OS, os); } + /** + * @since 2.0 + */ + @Override public void setWS(final String ws) { - fragmentRoot.setAttribute(WS, ws); + setAttribute(WS, ws); } + /** + * @since 2.0 + */ + @Override public void setNL(final String nl) { - fragmentRoot.setAttribute(NL, nl); + setAttribute(NL, nl); } + /** + * @since 2.0 + */ + @Override public void setArch(final String architecture) { - fragmentRoot.setAttribute(ARCH, architecture); + setAttribute(ARCH, architecture); } + /** + * @since 2.0 + */ + @Override public void setUpdateURL(final String urlLabel, final String url) { - Element urlNode = getNode(URL); - - if (urlNode == null) { - urlNode = createElement(URL); - fragmentRoot.appendChild(urlNode); - } + Element urlNode = forceElement(URL); + Element updateNode = forceElement(urlNode, UPDATE); - Element updateNode = getNodeChild(UPDATE, urlNode); - if (updateNode == null) { - updateNode = createElement(UPDATE); - urlNode.appendChild(updateNode); - } - - updateNode.setAttribute(LABEL, urlLabel); - updateNode.setAttribute(URL, url); + setAttribute(updateNode, LABEL, urlLabel); + setAttribute(updateNode, URL, url); } + /** + * @since 2.0 + */ + @Override public void addPlugin(final String pluginName) { // Get the plug-in element or create it if it does not exist - Element pluginNode = getPlugin(pluginName); - - if (pluginNode == null) { - pluginNode = createElement(PLUGIN); - fragmentRoot.appendChild(pluginNode); + Element plugin = forcePlugin(pluginName); + if (!plugin.hasAttribute(VERSION)) { + plugin.setAttribute(VERSION, "0.0.0"); //$NON-NLS-1$ + } + if (!plugin.hasAttribute("download-size")) { + plugin.setAttribute("download-size", "0"); //$NON-NLS-1$ + } + if (!plugin.hasAttribute("install-size")) { + plugin.setAttribute("install-size", "0"); //$NON-NLS-1$ + } + if (!plugin.hasAttribute("unpack")) { + plugin.setAttribute("unpack", "false"); //$NON-NLS-1$ } - - // Set the id on the element - pluginNode.setAttribute(ID, pluginName); } + /** + * @since 2.0 + */ + @Override public void addRequiredFeature(final String featureName, final String version) { - // Make sure the "requires" element exists - Element requires = getNode(REQUIRES); - - if (requires == null) { - requires = createElement(REQUIRES); - fragmentRoot.appendChild(requires); - } - // Get or create the required feature element - Element feature = getRequiredFeature(featureName); - - if (feature == null) { - feature = createElement(IMPORT); - requires.appendChild(feature); - } + Element feature = forceRequiredFeature(featureName); // Set the element values - feature.setAttribute(FEATURE, featureName); feature.setAttribute(VERSION, version); } + /** + * @since 2.0 + */ + @Override public void addRequiredPlugin(final String pluginName) { - // Make sure the "requires" element exists - Element requires = getNode(REQUIRES); - - if (requires == null) { - requires = createElement(REQUIRES); - fragmentRoot.appendChild(requires); - } - // Get or create the plug-in element - Element plugin = getRequiredPlugin(pluginName); - - if (plugin == null) { - plugin = createElement(IMPORT); - requires.appendChild(plugin); - } - - plugin.setAttribute(PLUGIN, pluginName); + forceRequiredPlugin(pluginName); } + /** + * @since 2.0 + */ + @Override public void addInclude(final String featureName, final String version) { - Element includeNode = getInclude(featureName); - - if (includeNode == null) { - includeNode = createElement(INCLUDES); - fragmentRoot.appendChild(includeNode); - } - - includeNode.setAttribute(ID, featureName); - includeNode.setAttribute(VERSION, version); + Element includeNode = forceInclude(featureName); + setAttribute(includeNode, VERSION, (version == null) ? "0.0.0" : version); } /** * Creates an element and returns it. * - * @param elementName the name of the element to create + * @param elementName + * the name of the element to create * @return the created element */ private Element createElement(String elementName) { - return fragmentXML.createElement(elementName); + return featureXML.createElement(elementName); } protected void setURLNode(final String nodeName, final String url, final String description) { - if (exists()) { - Element extension = getNode(nodeName); - if (extension == null) { - extension = fragmentXML.createElement(nodeName); - if (url != null) { - extension.setAttribute(URL, url); - } - extension.setTextContent(description); - fragmentRoot.appendChild(extension); - } else { - if (url != null) { - extension.setAttribute(URL, url); - } - extension.setTextContent(description); + if (featureRoot != null) { + Element urlNode = forceElement(nodeName); + if (url != null) { + setAttribute(urlNode, URL, url); } + setTextContent(urlNode, description); } } @@ -444,8 +542,10 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje * Gets an element inside a parent element. * * @param parentElement - * @param nodeName the node name of the element - * @param attributeValue the value of the element's attribute to retrieve + * @param nodeName + * the node name of the element + * @param attributeValue + * the value of the element's attribute to retrieve * @return the element or null if it does not exist */ private Element getElement(final Element parentElement, final String nodeName, final String attributeName, final String attributeValue) { @@ -489,12 +589,13 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje /** * Gets a node element inside the root element. * - * @param nodeName the node name + * @param nodeName + * the node name * @return the node element or null if it does not exist. */ private Element getNode(final String nodeName) { - if (exists()) { - final NodeList nodes = fragmentRoot.getChildNodes(); + if (featureRoot != null) { + final NodeList nodes = featureRoot.getChildNodes(); for (int i = 0; i < nodes.getLength(); i++) { final Node item = nodes.item(i); if (item instanceof NodeList) { @@ -512,11 +613,31 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje } private Element getPlugin(String pluginName) { - return getElement(fragmentRoot, PLUGIN, ID, pluginName); + return getElement(featureRoot, PLUGIN, ID, pluginName); + } + + private Element forcePlugin(String pluginName) { + Element result = getPlugin(pluginName); + if (result == null) { + result = createElement(PLUGIN); + featureRoot.appendChild(result); + setAttribute(result, ID, pluginName); + } + return result; } private Element getInclude(String featureName) { - return getElement(fragmentRoot, INCLUDES, ID, featureName); + return getElement(featureRoot, INCLUDES, ID, featureName); + } + + private Element forceInclude(String featureName) { + Element result = getInclude(featureName); + if (result == null) { + result = createElement(INCLUDES); + featureRoot.appendChild(result); + setAttribute(result, ID, featureName); + } + return result; } /** @@ -533,6 +654,18 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje return null; } + private Element forceRequiredPlugin(String pluginName) { + Element result = getRequiredPlugin(pluginName); + + if (result == null) { + result = createElement(IMPORT); + forceElement(REQUIRES).appendChild(result); + setAttribute(result, PLUGIN, pluginName); + } + + return result; + } + private String getNodeAttribute(Node node, String name) { Node attribute = node.getAttributes().getNamedItem(name); @@ -549,4 +682,16 @@ public class FeatureProjectEditor extends ProjectEditor implements IFeatureProje return null; } + private Element forceRequiredFeature(String featureName) { + Element result = getRequiredFeature(featureName); + + if (result == null) { + result = createElement(IMPORT); + forceElement(REQUIRES).appendChild(result); + setAttribute(result, FEATURE, featureName); + } + + return result; + } + } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/JavaProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/JavaProjectEditor.java index e53e0677537..f76d2f5213d 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/JavaProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/JavaProjectEditor.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. - * + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +8,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.project; @@ -76,15 +76,31 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit */ public JavaProjectEditor(final IProject project) throws CoreException { super(project); + this.javaProject = JavaCore.create(project); this.buildEditor = new BuildEditor(project); this.classpathEditor = new ClasspathEditor(this.javaProject); } /** + * Initializes me as a slave to another editor, which maintains the canonical + * project description. + * + * @param master + * my master editor + */ + JavaProjectEditor(AbstractProjectEditor master) { + super(master); + + this.javaProject = JavaCore.create(master.getProject()); + this.buildEditor = new BuildEditor(master.getProject()); + this.classpathEditor = new ClasspathEditor(this.javaProject); + } + + /** * * @return - * <code>true</code> if the project is a java project : + * <code>true</code> if the project is a java project : * */ @Override @@ -92,12 +108,6 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit return super.exists() && this.javaProject.exists(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingFiles() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingFiles() { Set<String> files = super.getMissingFiles(); @@ -106,12 +116,6 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit return files; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#getMissingNature() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingNature() { Set<String> natures = super.getMissingNature(); @@ -123,8 +127,6 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit @Override public void init() { - // TODO Auto-generated method stub - super.init(); this.classpathEditor.init(); this.buildEditor.init(); } @@ -137,15 +139,19 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit } + @Override + public boolean isDirty() { + return super.isDirty() || classpathEditor.isDirty() || buildEditor.isDirty(); + } /** * save the modification - * - * @throws Throwable + * + * @since 2.0 */ @Override - public void save() { - super.save(); + protected void doSave() { + super.doSave(); try { this.javaProject.save(new NullProgressMonitor(), true); } catch (JavaModelException ex) { @@ -155,12 +161,7 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit this.buildEditor.save(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IJavaProjectEditor#addJavaSourceFolder(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void addJavaSourceFolder(final String path) { if (exists()) { // we add this source folder to the class path @@ -173,54 +174,28 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#registerSourceFolder(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void registerSourceFolder(final String string) { this.buildEditor.registerSourceFolder(string); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#addToBuild(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void addToBuild(final String path) { this.buildEditor.addToBuild(path); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#isRegistred(java.lang.String) - * - * {@inheritDoc} - */ + @Override public boolean isRegisteredSourceFolder(final String path) { return this.buildEditor.isRegisteredSourceFolder(path); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getSourceFolders() - * - * {@inheritDoc} - */ + @Override public String[] getSourceFolders() { return this.buildEditor.getSourceFolders(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#getMissingBuildCommand() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingBuildCommand() { Set<String> buildCommand = super.getMissingBuildCommand(); @@ -230,43 +205,55 @@ public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEdit return buildCommand; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#removeFromBuild(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void removeFromBuild(String path) { buildEditor.removeFromBuild(path); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getElementsInBuild() - * - * {@inheritDoc} - */ + @Override public String[] getElementsInBuild() { return buildEditor.getElementsInBuild(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#registerBinFolder(java.lang.String) - * - * {@inheritDoc} - */ + @Override public void registerBinFolder(String binFolder) { buildEditor.registerBinFolder(binFolder); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#isRegisteredBinFolder(java.lang.String) - * - * {@inheritDoc} - */ + @Override public boolean isRegisteredBinFolder(String binFolder) { return buildEditor.isRegisteredBinFolder(binFolder); } + + /** + * @since 2.0 + */ + @Override + public void addSourceFolderToClasspath(String folderPath) { + classpathEditor.addSourceFolderToClasspath(folderPath); + } + + /** + * @since 2.0 + */ + @Override + public void addSourceFolderToClasspath(String srcPath, String binPath) { + classpathEditor.addSourceFolderToClasspath(srcPath, binPath); + } + + /** + * @since 2.0 + */ + @Override + public boolean isSourceFolderRegistered(String folderPath) { + return classpathEditor.isSourceFolderRegistered(folderPath); + } + + /** + * @since 2.0 + */ + @Override + public String[] getBinFolders() { + return classpathEditor.getBinFolders(); + } } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginEditor.java new file mode 100644 index 00000000000..143d73c1b65 --- /dev/null +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginEditor.java @@ -0,0 +1,369 @@ +/***************************************************************************** + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.eclipse.project.editors.project; + +import java.io.IOException; +import java.util.List; +import java.util.Set; + +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IJavaProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.pde.core.project.IPackageImportDescription; +import org.eclipse.pde.core.project.IRequiredBundleDescription; +import org.xml.sax.SAXException; + +/** + * @since 2.0 + */ +public class PluginEditor extends PluginProjectEditor implements IPluginEditor { + + protected IManifestEditor manifest; + + protected IJavaProjectEditor java; + + public PluginEditor(IProject project) throws CoreException, IOException, SAXException, ParserConfigurationException { + super(project); + + manifest = new ManifestEditor(project); + java = new JavaProjectEditor(this); + } + + public PluginProjectEditor getPluginEditor() { + return this; + } + + public IManifestEditor getManifestEditor() { + return manifest; + } + + public IJavaProjectEditor getJavaProjectEditor() { + return java; + } + + @Override + public Set<String> getMissingFiles() { + Set<String> result = super.getMissingFiles(); + result.addAll(java.getMissingFiles()); + result.addAll(manifest.getMissingFiles()); + return result; + } + + @Override + public Set<String> getMissingNature() { + Set<String> result = super.getMissingNature(); + result.addAll(java.getMissingNature()); + result.addAll(manifest.getMissingNature()); + return result; + } + + @Override + public Set<String> getMissingBuildCommand() { + Set<String> result = super.getMissingBuildCommand(); + result.addAll(java.getMissingBuildCommand()); + result.addAll(manifest.getMissingBuildCommand()); + return result; + } + + @Override + public void init() { + super.init(); + + java.init(); + manifest.init(); + } + + @Override + public void create() { + super.create(); + + java.create(); + manifest.create(); + } + + @Override + public void createFiles(Set<String> files) { + super.createFiles(files); + + java.createFiles(files); + manifest.createFiles(files); + } + + @Override + public boolean exists() { + // The plugin.xml doesn't have to exist for me to exist as a plug-in + return java.exists() && manifest.exists(); + } + + @Override + public boolean pluginManifestExists() { + return super.exists(); + } + + @Override + public void registerSourceFolder(String source) { + java.registerSourceFolder(source); + } + + @Override + public void addToBuild(String path) { + java.addToBuild(path); + } + + @Override + public String[] getSourceFolders() { + return java.getSourceFolders(); + } + + @Override + public void addDependency(String dependency) { + manifest.addDependency(dependency); + } + + @Override + public void addDependency(String dependency, String version) { + manifest.addDependency(dependency, version); + } + + /** + * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#hasDependency(java.lang.String) + * + * @param dependency + * @return + */ + @Override + public boolean hasDependency(String dependency) { + return manifest.hasDependency(dependency); + } + + @Override + public void setValue(String key, String value) { + manifest.setValue(key, value); + } + + @Override + public void setValue(String key, String name, String value) { + manifest.setValue(key, name, value); + } + + @Override + public void removeValue(String key, String value) { + manifest.removeValue(key, value); + } + + @Override + public void removeValue(String key) { + manifest.removeValue(key); + } + + @Override + public void setBundleName(String name) { + manifest.setBundleName(name); + } + + @Override + public String getSymbolicBundleName() { + return manifest.getSymbolicBundleName(); + } + + @Override + public String getBundleVersion() { + return manifest.getBundleVersion(); + } + + @Override + public void setBundleVersion(String version) { + manifest.setBundleVersion(version); + } + + @Override + public boolean isDirty() { + return super.isDirty() || manifest.isDirty() || java.isDirty(); + } + + @Override + protected void doSave() { + super.doSave(); + manifest.save(); + java.save(); + } + + @Override + public void registerBinFolder(String binFolder) { + java.registerBinFolder(binFolder); + } + + @Override + public void removeFromBuild(String path) { + java.removeFromBuild(path); + } + + @Override + public boolean isRegisteredSourceFolder(String path) { + return java.isRegisteredSourceFolder(path); + } + + @Override + public boolean isRegisteredBinFolder(String binFolder) { + return java.isRegisteredBinFolder(binFolder); + } + + @Override + public String[] getElementsInBuild() { + return java.getElementsInBuild(); + } + + @Override + public String getBundleVendor() { + return manifest.getBundleVendor(); + } + + @Override + public void setBundleVendor(String vendor) { + manifest.setBundleVendor(vendor); + } + + @Override + public String getValue(String key) { + return manifest.getValue(key); + } + + @Override + public String getValue(String key, String name) { + return manifest.getValue(key, name); + } + + @Override + public void setSymbolicBundleName(String name) { + manifest.setSymbolicBundleName(name); + } + + @Override + public String getBundleName() { + return manifest.getBundleName(); + } + + @Override + public String getBundleLocalization() { + return manifest.getBundleLocalization(); + } + + @Override + public void setSingleton(boolean singleton) { + manifest.setSingleton(singleton); + } + + @Override + @Deprecated + public void setDependenciesVersion(String dependencyPattern, String newVersion) { + manifest.setDependenciesVersion(dependencyPattern, newVersion); + } + + /** + * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String) + * + * @param packageName + */ + @Override + public void addImportPackage(String packageName) { + manifest.addImportPackage(packageName); + } + + /** + * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String, java.lang.String) + * + * @param packageName + * @param version + */ + @Override + public void addImportPackage(String packageName, String version) { + manifest.addImportPackage(packageName, version); + } + + /** + * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String) + * + * @param packageName + */ + @Override + public void addExportPackage(String packageName) { + manifest.addExportPackage(packageName); + } + + /** + * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String, java.lang.String) + * + * @param packageName + * @param version + */ + @Override + public void addExportPackage(String packageName, String version) { + manifest.addExportPackage(packageName, version); + } + + @Override + public List<IRequiredBundleDescription> getRequiredBundles() { + return manifest.getRequiredBundles(); + } + + @Override + public List<IPackageImportDescription> getImportedPackages() { + return manifest.getImportedPackages(); + } + + @Override + public void setRequiredBundleExported(String bundleName, boolean exported) { + manifest.setRequiredBundleExported(bundleName, exported); + } + + @Override + public void removeRequiredBundle(String bundleName) { + manifest.removeRequiredBundle(bundleName); + } + + @Override + public void removeImportedPackage(String packageName) { + manifest.removeImportedPackage(packageName); + } + + @Override + public void addJavaSourceFolder(String path) { + java.addJavaSourceFolder(path); + } + + @Override + public void addSourceFolderToClasspath(String folderPath) { + java.addSourceFolderToClasspath(folderPath); + } + + @Override + public void addSourceFolderToClasspath(String srcPath, String binPath) { + java.addSourceFolderToClasspath(srcPath, binPath); + } + + @Override + public boolean isSourceFolderRegistered(String folderPath) { + return java.isSourceFolderRegistered(folderPath); + } + + @Override + public String[] getBinFolders() { + return java.getBinFolders(); + } +} diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginProjectEditor.java index fd9563ad056..f14390a4d7a 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginProjectEditor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,6 +9,8 @@ * Contributors: * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation * Vincent Lorenzot (CEA-LIST) vincent.lorenzo@cea.fr + * Christian W. Damus - bug 485220 + * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.project; @@ -17,6 +19,7 @@ import java.io.InputStream; import java.io.StringWriter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Set; import javax.xml.parsers.DocumentBuilder; @@ -70,11 +73,16 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject } /** + * Initializes me as a slave to another editor, which maintains the canonical + * project description. * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#init() - * - * {@inheritDoc} + * @param master + * my master editor */ + PluginProjectEditor(AbstractProjectEditor master) { + super(master); + } + @Override public void init() { this.pluginFile = getPlugin(); @@ -118,26 +126,16 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject super.createFiles(files); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor.plugin.AbstractEditor#exists() - * - * {@inheritDoc} - */ @Override public boolean exists() { IFile plugin = getProject().getFile(PLUGIN_XML_FILE); return plugin.exists() && super.exists(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor#addExtension(java.lang.String) - * - * {@inheritDoc} - */ + @Override public Element addExtension(final String extensionPoint) { if (exists()) { + touch(); Element extension = this.pluginXML.createElement(EXTENSION); extension.setAttribute(POINT, extensionPoint); this.pluginRoot.appendChild(extension); @@ -152,8 +150,9 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject * @param extensionPoint * the name of an extension point * @return - * the list of the registered extension with this extension point + * the list of the registered extension with this extension point */ + @Override public List<Node> getExtensions(final String extensionPoint) { if (exists()) { NodeList nodes = this.pluginRoot.getChildNodes(); @@ -179,33 +178,22 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor#setAttribute(org.w3c.dom.Element, java.lang.String, java.lang.String) - * - * {@inheritDoc} - */ + @Override public void setAttribute(final Element element, final String attributeName, final String attributeValue) { - element.setAttribute(attributeName, attributeValue); + if (!Objects.equals(element.getAttribute(attributeName), attributeValue)) { + touch(); + element.setAttribute(attributeName, attributeValue); + } } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor#addChild(org.w3c.dom.Element, java.lang.String) - * - * {@inheritDoc} - */ + @Override public Element addChild(final Element element, final String childName) { + touch(); Element child = this.pluginXML.createElement(childName); element.appendChild(child); return child; } - /** - * - * @return - * the plugin file if it exists - */ private IFile getPlugin() { IFile plugin = getProject().getFile(PLUGIN_XML_FILE); if (plugin.exists()) { @@ -216,13 +204,10 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#save() - * - * {@inheritDoc} + * @since 2.0 */ @Override - public void save() { + protected void doSave() { if (exists()) { try { TransformerFactory transformerFactory = TransformerFactory.newInstance(); @@ -247,15 +232,9 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject Activator.log.error(ex); } } - super.save(); + super.doSave(); } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingNature() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingNature() { Set<String> natures = super.getMissingNature(); @@ -265,12 +244,6 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject return natures; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingFiles() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingFiles() { Set<String> files = super.getMissingFiles(); @@ -281,12 +254,6 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject return files; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#getMissingBuildCommand() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingBuildCommand() { Set<String> commands = super.getMissingBuildCommand(); @@ -296,11 +263,7 @@ public class PluginProjectEditor extends ProjectEditor implements IPluginProject return commands; } - /** - * @return The XML Document associated to this plugin.xml file - * @see PluginProjectEditor#init() - * @see PluginProjectEditor#create() - */ + @Override public Document getDocument() { return pluginXML; } diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/ProjectEditor.java b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/ProjectEditor.java index 253339a1b4f..1537800954d 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/ProjectEditor.java +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/ProjectEditor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 CEA LIST. + * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,8 @@ * * Contributors: * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * *****************************************************************************/ package org.eclipse.papyrus.eclipse.project.editors.project; @@ -17,7 +19,6 @@ import java.net.URL; import java.util.Set; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -47,22 +48,16 @@ public class ProjectEditor extends AbstractProjectEditor implements IProjectEdit } /** + * Initializes me as a slave to another editor, which maintains the canonical + * project description. * - * Constructor. - * - * @param folder - * a folder - * @throws CoreException + * @param master + * my master editor */ - public ProjectEditor(final IFolder folder) throws CoreException { - super(null); - // TODO : create an action to import a folder as a project! - // this will allow to test the create method - throw new UnsupportedOperationException(); + ProjectEditor(AbstractProjectEditor master) { + super(master); } - - /** * Create the project file * TODO NOT TESTED @@ -71,6 +66,7 @@ public class ProjectEditor extends AbstractProjectEditor implements IProjectEdit * * {@inheritDoc} */ + @Override public void createFiles(final Set<String> files) { if (files.contains(PROJECT_FILE)) { final IFile file = getProject().getFile(PROJECT_FILE); @@ -97,12 +93,6 @@ public class ProjectEditor extends AbstractProjectEditor implements IProjectEdit } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingFiles() - * - * {@inheritDoc} - */ @Override public Set<String> getMissingFiles() { final Set<String> missingFile = super.getMissingFiles(); @@ -113,14 +103,7 @@ public class ProjectEditor extends AbstractProjectEditor implements IProjectEdit return missingFile; } - /** - * - * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#addFile(java.net.URL, java.lang.String) - * - * @param url - * @param fileDestinationPath - * @param eraseExitingFile - */ + @Override public void addFile(final URL url, final String fileDestinationPath, final boolean eraseExitingFile) { final IFile targetFile = getProject().getFile(new Path(fileDestinationPath)); if (targetFile.exists()) { @@ -136,7 +119,6 @@ public class ProjectEditor extends AbstractProjectEditor implements IProjectEdit } try { final InputStream is = url.openStream(); - ; targetFile.create(is, false, new NullProgressMonitor()); is.close(); targetFile.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor()); diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.project b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.project index 0bab1c4c8a4..5772f26c161 100644 --- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.project +++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.editor.perspectiveconfiguration</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.editor.perspectiveconfiguration</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF index bd8e6cf307d..aad551d052c 100644 --- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF +++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF @@ -1,13 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.editor.perspectiveconfiguration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.editor.perspectiveconfiguration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.editor.perspectiveconfiguration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.editor.perspectiveconfiguration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/editor/org.eclipse.papyrus.editor/.project b/plugins/editor/org.eclipse.papyrus.editor/.project index a1655428dd3..bcda344097c 100644 --- a/plugins/editor/org.eclipse.papyrus.editor/.project +++ b/plugins/editor/org.eclipse.papyrus.editor/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.editor</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.editor</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF index db81ddb06ad..d23769077ef 100644 --- a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF +++ b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF @@ -1,20 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.editor
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.editor.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.editor +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.editor.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/.project b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/.project index 7f60c78dd50..2b1154b0449 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/.project +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/.project @@ -1,22 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.doc</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <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>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.doc</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF index 6464a251496..b24851aacac 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.doc;singleton:=true diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/.project b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/.project index 37a45cbabee..1d93957f772 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/.project +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/.project @@ -1,22 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <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>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF index 9bbabe59198..d6613a42d15 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Facet Custom Editor Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc;singleton:=true Bundle-Version: 1.2.0.qualifier -Require-Bundle: org.eclipse.help +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)" Bundle-Vendor: Eclipse Modeling Project diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.project b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.project index 82f9bcd4a08..89442333d54 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.project +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.metamodel.editor</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.metamodel.editor</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF index bd3e4c3afe1..c7d6cec7b71 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF @@ -1,29 +1,23 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.emf.facet.custom.metamodel.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.ui.forms,
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.emf.ecore.edit,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.jface,
- org.eclipse.papyrus.emf.facet.custom.sdk.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.presentation.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.custom.metamodel.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.sdk.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.presentation.Activator +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.project b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.project index c83ba113fcb..1a601602c8c 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.project +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.doc</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.doc</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF index 026e8ef7225..aa4f6ad09b8 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.apache.ant;bundle-version="1.7.1"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.apache.ant;bundle-version="[1.9.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.doc;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/.project index 22b117a6906..3517e712d79 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/.project @@ -37,8 +37,26 @@ </dictionary> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/META-INF/MANIFEST.MF index a7859acaa5a..38a124e5f71 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.aggregate.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.aggregate.doc;singleton:=true diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.project index 661dff5f089..c8b30b781c4 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.project @@ -1,30 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.common.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.common.core</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF index 6aadcb4db43..ca3c23aa8e3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.common.core.internal,
- org.eclipse.papyrus.emf.facet.common.core.internal.utils
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- com.ibm.icu;bundle-version="4.2.1"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.common.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.common.core.internal, + org.eclipse.papyrus.emf.facet.common.core.internal.utils +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + com.ibm.icu;bundle-version="54.0.0" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.common.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.core;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.project index bd536308433..45f55a51513 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.project @@ -1,29 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.common.sdk.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.common.sdk.core</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF index 802d11d9cb3..0fd0c7ca872 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF @@ -1,21 +1,20 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported;x-friends:="org.eclipse.papyrus.emf.facet.common.sdk.ui,
- org.eclipse.papyrus.emf.facet.custom.sdk.core",
- org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.utils
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.2.0",
- org.eclipse.pde.core;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- com.ibm.icu;bundle-version="4.2.1",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
- org.eclipse.jdt.launching;bundle-version="3.5.100"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.sdk.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported;x-friends:="org.eclipse.papyrus.emf.facet.common.sdk.ui, + org.eclipse.papyrus.emf.facet.custom.sdk.core", + org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.utils +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="[1.2.0,2.0.0)", + org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + com.ibm.icu;bundle-version="54.0.0", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)", + org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.sdk.core;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.project index b5d5a7ab934..b71a84a0f4e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.common.ui</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.common.ui</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF index fcbe042cf11..aa513ac84c3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF @@ -1,22 +1,21 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.common.ui.internal,
- org.eclipse.papyrus.emf.facet.common.ui.internal.controls,
- org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers,
- org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views,
- org.eclipse.papyrus.emf.facet.common.ui.internal.preference.pages,
- org.eclipse.papyrus.emf.facet.common.ui.internal.views,
- org.eclipse.papyrus.emf.facet.common.ui.internal.widgets
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.common.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.common.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.common.ui.internal, + org.eclipse.papyrus.emf.facet.common.ui.internal.controls, + org.eclipse.papyrus.emf.facet.common.ui.internal.controls.wrappers, + org.eclipse.papyrus.emf.facet.common.ui.internal.exported.views, + org.eclipse.papyrus.emf.facet.common.ui.internal.preference.pages, + org.eclipse.papyrus.emf.facet.common.ui.internal.views, + org.eclipse.papyrus.emf.facet.common.ui.internal.widgets +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.common.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.common.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.project index 6725a7be7f4..226acb22948 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.project @@ -1,31 +1,44 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.core</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF index a8d56779409..ed6fbd5ffff 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF @@ -1,25 +1,21 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.custom.core,
- org.eclipse.papyrus.emf.facet.custom.core.exception,
- org.eclipse.papyrus.emf.facet.custom.core.internal,
- org.eclipse.papyrus.emf.facet.custom.core.internal.exception,
- org.eclipse.papyrus.emf.facet.custom.core.internal.exported,
- org.eclipse.papyrus.emf.facet.custom.core.internal.query
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.emf.validation;bundle-version="1.4.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.custom.core, + org.eclipse.papyrus.emf.facet.custom.core.exception, + org.eclipse.papyrus.emf.facet.custom.core.internal, + org.eclipse.papyrus.emf.facet.custom.core.internal.exception, + org.eclipse.papyrus.emf.facet.custom.core.internal.exported, + org.eclipse.papyrus.emf.facet.custom.core.internal.query +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.core;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.project index 5ec0b643369..269280e9379 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.metamodel.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.metamodel.edit</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF index 6350a65d2f8..b267c1b7ae4 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF @@ -1,17 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.provider;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit,
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.2.0";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.provider;x-internal:=true +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.project index e9fd540e503..b764990c49c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.project @@ -1,28 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.metamodel</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.metamodel</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.settings/.api_filters b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.settings/.api_filters new file mode 100644 index 00000000000..03840fb6de9 --- /dev/null +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.settings/.api_filters @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.emf.facet.custom.metamodel" version="2"> + <resource path="src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java" type="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"> + <filter comment="EMF package interfaces are not intended to be implemented or extended by clients" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/> + <message_argument value="ECLASS_CUSTOMIZATION_FEATURE_COUNT"/> + <message_argument value="14"/> + </message_arguments> + </filter> + <filter comment="EMF package interfaces are not intended to be implemented or extended by clients" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/> + <message_argument value="FACET_CUSTOMIZATION_FEATURE_COUNT"/> + <message_argument value="15"/> + </message_arguments> + </filter> + <filter comment="EMF package interfaces are not intended to be implemented or extended by clients" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage"/> + <message_argument value="FACET_CUSTOMIZATION__CUSTOMIZED_FACET"/> + <message_argument value="14"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF index b16087788f7..1e7b5b27d6f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF @@ -1,24 +1,22 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.custompt,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.util,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.customizationcatalog,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt;x-internal:=true,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.impl,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query,
- org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query.util;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.custompt, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.util, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.customizationcatalog, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custompt;x-internal:=true, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.impl, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query, + org.eclipse.papyrus.emf.facet.custom.metamodel.v0_3_0.query.util;x-internal:=true +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java index 57112f94add..f26bf2d3db7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java @@ -1,904 +1,906 @@ -/**
- * Copyright (c) 2011 Mia-Software.
- *
- * 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:
- * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
- * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
- * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
- * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet
- */
-package org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.ExtensiblePackage;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
- * accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory
- * @model kind="package"
- * @generated
- */
-public interface CustomPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "custom";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "custom";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- CustomPackage eINSTANCE = org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl <em>Customization</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getCustomization()
- * @generated
- */
- int CUSTOMIZATION = 0;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__EANNOTATIONS = EFacetPackage.FACET_SET__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__NAME = EFacetPackage.FACET_SET__NAME;
-
- /**
- * The feature id for the '<em><b>Ns URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__NS_URI = EFacetPackage.FACET_SET__NS_URI;
-
- /**
- * The feature id for the '<em><b>Ns Prefix</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__NS_PREFIX = EFacetPackage.FACET_SET__NS_PREFIX;
-
- /**
- * The feature id for the '<em><b>EFactory Instance</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__EFACTORY_INSTANCE = EFacetPackage.FACET_SET__EFACTORY_INSTANCE;
-
- /**
- * The feature id for the '<em><b>EClassifiers</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__ECLASSIFIERS = EFacetPackage.FACET_SET__ECLASSIFIERS;
-
- /**
- * The feature id for the '<em><b>ESubpackages</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__ESUBPACKAGES = EFacetPackage.FACET_SET__ESUBPACKAGES;
-
- /**
- * The feature id for the '<em><b>ESuper Package</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__ESUPER_PACKAGE = EFacetPackage.FACET_SET__ESUPER_PACKAGE;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__DOCUMENTATION = EFacetPackage.FACET_SET__DOCUMENTATION;
-
- /**
- * The feature id for the '<em><b>Categories</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__CATEGORIES = EFacetPackage.FACET_SET__CATEGORIES;
-
- /**
- * The feature id for the '<em><b>Must Be Loaded By Default</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__MUST_BE_LOADED_BY_DEFAULT = EFacetPackage.FACET_SET_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Rank</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION__RANK = EFacetPackage.FACET_SET_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Customization</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CUSTOMIZATION_FEATURE_COUNT = EFacetPackage.FACET_SET_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl <em>EClass Customization</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getEClassCustomization()
- * @generated
- */
- int ECLASS_CUSTOMIZATION = 1;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__EANNOTATIONS = EFacetPackage.FACET__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__NAME = EFacetPackage.FACET__NAME;
-
- /**
- * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__INSTANCE_CLASS_NAME = EFacetPackage.FACET__INSTANCE_CLASS_NAME;
-
- /**
- * The feature id for the '<em><b>Instance Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__INSTANCE_CLASS = EFacetPackage.FACET__INSTANCE_CLASS;
-
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__DEFAULT_VALUE = EFacetPackage.FACET__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Instance Type Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__INSTANCE_TYPE_NAME = EFacetPackage.FACET__INSTANCE_TYPE_NAME;
-
- /**
- * The feature id for the '<em><b>EPackage</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__EPACKAGE = EFacetPackage.FACET__EPACKAGE;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__ETYPE_PARAMETERS = EFacetPackage.FACET__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__DOCUMENTATION = EFacetPackage.FACET__DOCUMENTATION;
-
- /**
- * The feature id for the '<em><b>Extended Metaclass</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__EXTENDED_METACLASS = EFacetPackage.FACET__EXTENDED_METACLASS;
-
- /**
- * The feature id for the '<em><b>Facet Elements</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__FACET_ELEMENTS = EFacetPackage.FACET__FACET_ELEMENTS;
-
- /**
- * The feature id for the '<em><b>Facet Operations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__FACET_OPERATIONS = EFacetPackage.FACET__FACET_OPERATIONS;
-
- /**
- * The feature id for the '<em><b>Conformance Typed Element</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__CONFORMANCE_TYPED_ELEMENT = EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Extended Facets</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION__EXTENDED_FACETS = EFacetPackage.FACET__EXTENDED_FACETS;
-
- /**
- * The number of structural features of the '<em>EClass Customization</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ECLASS_CUSTOMIZATION_FEATURE_COUNT = EFacetPackage.FACET_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl <em>Facet Customization</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getFacetCustomization()
- * @generated
- */
- int FACET_CUSTOMIZATION = 2;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__EANNOTATIONS = EFacetPackage.FACET__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__NAME = EFacetPackage.FACET__NAME;
-
- /**
- * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__INSTANCE_CLASS_NAME = EFacetPackage.FACET__INSTANCE_CLASS_NAME;
-
- /**
- * The feature id for the '<em><b>Instance Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__INSTANCE_CLASS = EFacetPackage.FACET__INSTANCE_CLASS;
-
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__DEFAULT_VALUE = EFacetPackage.FACET__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Instance Type Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__INSTANCE_TYPE_NAME = EFacetPackage.FACET__INSTANCE_TYPE_NAME;
-
- /**
- * The feature id for the '<em><b>EPackage</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__EPACKAGE = EFacetPackage.FACET__EPACKAGE;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__ETYPE_PARAMETERS = EFacetPackage.FACET__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__DOCUMENTATION = EFacetPackage.FACET__DOCUMENTATION;
-
- /**
- * The feature id for the '<em><b>Extended Metaclass</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__EXTENDED_METACLASS = EFacetPackage.FACET__EXTENDED_METACLASS;
-
- /**
- * The feature id for the '<em><b>Facet Elements</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__FACET_ELEMENTS = EFacetPackage.FACET__FACET_ELEMENTS;
-
- /**
- * The feature id for the '<em><b>Facet Operations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__FACET_OPERATIONS = EFacetPackage.FACET__FACET_OPERATIONS;
-
- /**
- * The feature id for the '<em><b>Conformance Typed Element</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__CONFORMANCE_TYPED_ELEMENT = EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Extended Facets</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__EXTENDED_FACETS = EFacetPackage.FACET__EXTENDED_FACETS;
-
- /**
- * The feature id for the '<em><b>Customized Facet</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION__CUSTOMIZED_FACET = EFacetPackage.FACET_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Facet Customization</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_CUSTOMIZATION_FEATURE_COUNT = EFacetPackage.FACET_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl <em>ETyped Element Switch Query</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementSwitchQuery()
- * @generated
- */
- int ETYPED_ELEMENT_SWITCH_QUERY = 3;
-
- /**
- * The feature id for the '<em><b>Can Have Side Effects</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ETYPED_ELEMENT_SWITCH_QUERY__CAN_HAVE_SIDE_EFFECTS = ExtensiblePackage.QUERY__CAN_HAVE_SIDE_EFFECTS;
-
- /**
- * The feature id for the '<em><b>Can Be Cached</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ETYPED_ELEMENT_SWITCH_QUERY__CAN_BE_CACHED = ExtensiblePackage.QUERY__CAN_BE_CACHED;
-
- /**
- * The feature id for the '<em><b>Cases</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ETYPED_ELEMENT_SWITCH_QUERY__CASES = ExtensiblePackage.QUERY_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>ETyped Element Switch Query</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ETYPED_ELEMENT_SWITCH_QUERY_FEATURE_COUNT = ExtensiblePackage.QUERY_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl <em>ETyped Element Case</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementCase()
- * @generated
- */
- int ETYPED_ELEMENT_CASE = 4;
-
- /**
- * The feature id for the '<em><b>Case</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ETYPED_ELEMENT_CASE__CASE = 0;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ETYPED_ELEMENT_CASE__VALUE = 1;
-
- /**
- * The number of structural features of the '<em>ETyped Element Case</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ETYPED_ELEMENT_CASE_FEATURE_COUNT = 2;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization <em>Customization</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Customization</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization
- * @generated
- */
- EClass getCustomization();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#isMustBeLoadedByDefault <em>Must Be Loaded By Default</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Must Be Loaded By Default</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#isMustBeLoadedByDefault()
- * @see #getCustomization()
- * @generated
- */
- EAttribute getCustomization_MustBeLoadedByDefault();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#getRank <em>Rank</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Rank</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#getRank()
- * @see #getCustomization()
- * @generated
- */
- EAttribute getCustomization_Rank();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization <em>EClass Customization</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>EClass Customization</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization
- * @generated
- */
- EClass getEClassCustomization();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization <em>Facet Customization</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Facet Customization</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization
- * @generated
- */
- EClass getFacetCustomization();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization#getCustomizedFacet <em>Customized Facet</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Customized Facet</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization#getCustomizedFacet()
- * @see #getFacetCustomization()
- * @generated
- */
- EReference getFacetCustomization_CustomizedFacet();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery <em>ETyped Element Switch Query</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>ETyped Element Switch Query</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery
- * @generated
- */
- EClass getETypedElementSwitchQuery();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery#getCases <em>Cases</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Cases</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery#getCases()
- * @see #getETypedElementSwitchQuery()
- * @generated
- */
- EReference getETypedElementSwitchQuery_Cases();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase <em>ETyped Element Case</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>ETyped Element Case</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase
- * @generated
- */
- EClass getETypedElementCase();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getCase <em>Case</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Case</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getCase()
- * @see #getETypedElementCase()
- * @generated
- */
- EReference getETypedElementCase_Case();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getValue <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference '<em>Value</em>'.
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getValue()
- * @see #getETypedElementCase()
- * @generated
- */
- EReference getETypedElementCase_Value();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- CustomFactory getCustomFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl <em>Customization</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getCustomization()
- * @generated
- */
- EClass CUSTOMIZATION = eINSTANCE.getCustomization();
-
- /**
- * The meta object literal for the '<em><b>Must Be Loaded By Default</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute CUSTOMIZATION__MUST_BE_LOADED_BY_DEFAULT = eINSTANCE.getCustomization_MustBeLoadedByDefault();
-
- /**
- * The meta object literal for the '<em><b>Rank</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute CUSTOMIZATION__RANK = eINSTANCE.getCustomization_Rank();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl <em>EClass Customization</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getEClassCustomization()
- * @generated
- */
- EClass ECLASS_CUSTOMIZATION = eINSTANCE.getEClassCustomization();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl <em>Facet Customization</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getFacetCustomization()
- * @generated
- */
- EClass FACET_CUSTOMIZATION = eINSTANCE.getFacetCustomization();
-
- /**
- * The meta object literal for the '<em><b>Customized Facet</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET_CUSTOMIZATION__CUSTOMIZED_FACET = eINSTANCE.getFacetCustomization_CustomizedFacet();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl <em>ETyped Element Switch Query</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementSwitchQuery()
- * @generated
- */
- EClass ETYPED_ELEMENT_SWITCH_QUERY = eINSTANCE.getETypedElementSwitchQuery();
-
- /**
- * The meta object literal for the '<em><b>Cases</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference ETYPED_ELEMENT_SWITCH_QUERY__CASES = eINSTANCE.getETypedElementSwitchQuery_Cases();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl <em>ETyped Element Case</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl
- * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementCase()
- * @generated
- */
- EClass ETYPED_ELEMENT_CASE = eINSTANCE.getETypedElementCase();
-
- /**
- * The meta object literal for the '<em><b>Case</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference ETYPED_ELEMENT_CASE__CASE = eINSTANCE.getETypedElementCase_Case();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference ETYPED_ELEMENT_CASE__VALUE = eINSTANCE.getETypedElementCase_Value();
-
- }
-
-} // CustomPackage
+/** + * Copyright (c) 2011 Mia-Software. + * + * 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: + * Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model + * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework + * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning + * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet + */ +package org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.ExtensiblePackage; + +/** + * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains + * accessors for the meta objects to represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory + * @model kind="package" + * @generated + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. + */ +public interface CustomPackage extends EPackage { + /** + * The package name. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + String eNAME = "custom"; + + /** + * The package namespace URI. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"; + + /** + * The package namespace name. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + String eNS_PREFIX = "custom"; + + /** + * The singleton instance of the package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + CustomPackage eINSTANCE = org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl.init(); + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl <em>Customization</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getCustomization() + * @generated + */ + int CUSTOMIZATION = 0; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__EANNOTATIONS = EFacetPackage.FACET_SET__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__NAME = EFacetPackage.FACET_SET__NAME; + + /** + * The feature id for the '<em><b>Ns URI</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__NS_URI = EFacetPackage.FACET_SET__NS_URI; + + /** + * The feature id for the '<em><b>Ns Prefix</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__NS_PREFIX = EFacetPackage.FACET_SET__NS_PREFIX; + + /** + * The feature id for the '<em><b>EFactory Instance</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__EFACTORY_INSTANCE = EFacetPackage.FACET_SET__EFACTORY_INSTANCE; + + /** + * The feature id for the '<em><b>EClassifiers</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__ECLASSIFIERS = EFacetPackage.FACET_SET__ECLASSIFIERS; + + /** + * The feature id for the '<em><b>ESubpackages</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__ESUBPACKAGES = EFacetPackage.FACET_SET__ESUBPACKAGES; + + /** + * The feature id for the '<em><b>ESuper Package</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__ESUPER_PACKAGE = EFacetPackage.FACET_SET__ESUPER_PACKAGE; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__DOCUMENTATION = EFacetPackage.FACET_SET__DOCUMENTATION; + + /** + * The feature id for the '<em><b>Categories</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__CATEGORIES = EFacetPackage.FACET_SET__CATEGORIES; + + /** + * The feature id for the '<em><b>Must Be Loaded By Default</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__MUST_BE_LOADED_BY_DEFAULT = EFacetPackage.FACET_SET_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Rank</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION__RANK = EFacetPackage.FACET_SET_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>Customization</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CUSTOMIZATION_FEATURE_COUNT = EFacetPackage.FACET_SET_FEATURE_COUNT + 2; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl <em>EClass Customization</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getEClassCustomization() + * @generated + */ + int ECLASS_CUSTOMIZATION = 1; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__EANNOTATIONS = EFacetPackage.FACET__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__NAME = EFacetPackage.FACET__NAME; + + /** + * The feature id for the '<em><b>Instance Class Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__INSTANCE_CLASS_NAME = EFacetPackage.FACET__INSTANCE_CLASS_NAME; + + /** + * The feature id for the '<em><b>Instance Class</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__INSTANCE_CLASS = EFacetPackage.FACET__INSTANCE_CLASS; + + /** + * The feature id for the '<em><b>Default Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__DEFAULT_VALUE = EFacetPackage.FACET__DEFAULT_VALUE; + + /** + * The feature id for the '<em><b>Instance Type Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__INSTANCE_TYPE_NAME = EFacetPackage.FACET__INSTANCE_TYPE_NAME; + + /** + * The feature id for the '<em><b>EPackage</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__EPACKAGE = EFacetPackage.FACET__EPACKAGE; + + /** + * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__ETYPE_PARAMETERS = EFacetPackage.FACET__ETYPE_PARAMETERS; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__DOCUMENTATION = EFacetPackage.FACET__DOCUMENTATION; + + /** + * The feature id for the '<em><b>Extended Metaclass</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__EXTENDED_METACLASS = EFacetPackage.FACET__EXTENDED_METACLASS; + + /** + * The feature id for the '<em><b>Facet Elements</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__FACET_ELEMENTS = EFacetPackage.FACET__FACET_ELEMENTS; + + /** + * The feature id for the '<em><b>Facet Operations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__FACET_OPERATIONS = EFacetPackage.FACET__FACET_OPERATIONS; + + /** + * The feature id for the '<em><b>Conformance Typed Element</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__CONFORMANCE_TYPED_ELEMENT = EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT; + + /** + * The feature id for the '<em><b>Extended Facets</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION__EXTENDED_FACETS = EFacetPackage.FACET__EXTENDED_FACETS; + + /** + * The number of structural features of the '<em>EClass Customization</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ECLASS_CUSTOMIZATION_FEATURE_COUNT = EFacetPackage.FACET_FEATURE_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl <em>Facet Customization</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getFacetCustomization() + * @generated + */ + int FACET_CUSTOMIZATION = 2; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__EANNOTATIONS = EFacetPackage.FACET__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__NAME = EFacetPackage.FACET__NAME; + + /** + * The feature id for the '<em><b>Instance Class Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__INSTANCE_CLASS_NAME = EFacetPackage.FACET__INSTANCE_CLASS_NAME; + + /** + * The feature id for the '<em><b>Instance Class</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__INSTANCE_CLASS = EFacetPackage.FACET__INSTANCE_CLASS; + + /** + * The feature id for the '<em><b>Default Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__DEFAULT_VALUE = EFacetPackage.FACET__DEFAULT_VALUE; + + /** + * The feature id for the '<em><b>Instance Type Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__INSTANCE_TYPE_NAME = EFacetPackage.FACET__INSTANCE_TYPE_NAME; + + /** + * The feature id for the '<em><b>EPackage</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__EPACKAGE = EFacetPackage.FACET__EPACKAGE; + + /** + * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__ETYPE_PARAMETERS = EFacetPackage.FACET__ETYPE_PARAMETERS; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__DOCUMENTATION = EFacetPackage.FACET__DOCUMENTATION; + + /** + * The feature id for the '<em><b>Extended Metaclass</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__EXTENDED_METACLASS = EFacetPackage.FACET__EXTENDED_METACLASS; + + /** + * The feature id for the '<em><b>Facet Elements</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__FACET_ELEMENTS = EFacetPackage.FACET__FACET_ELEMENTS; + + /** + * The feature id for the '<em><b>Facet Operations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__FACET_OPERATIONS = EFacetPackage.FACET__FACET_OPERATIONS; + + /** + * The feature id for the '<em><b>Conformance Typed Element</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__CONFORMANCE_TYPED_ELEMENT = EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT; + + /** + * The feature id for the '<em><b>Extended Facets</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__EXTENDED_FACETS = EFacetPackage.FACET__EXTENDED_FACETS; + + /** + * The feature id for the '<em><b>Customized Facet</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION__CUSTOMIZED_FACET = EFacetPackage.FACET_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Facet Customization</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_CUSTOMIZATION_FEATURE_COUNT = EFacetPackage.FACET_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl <em>ETyped Element Switch Query</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementSwitchQuery() + * @generated + */ + int ETYPED_ELEMENT_SWITCH_QUERY = 3; + + /** + * The feature id for the '<em><b>Can Have Side Effects</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ETYPED_ELEMENT_SWITCH_QUERY__CAN_HAVE_SIDE_EFFECTS = ExtensiblePackage.QUERY__CAN_HAVE_SIDE_EFFECTS; + + /** + * The feature id for the '<em><b>Can Be Cached</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ETYPED_ELEMENT_SWITCH_QUERY__CAN_BE_CACHED = ExtensiblePackage.QUERY__CAN_BE_CACHED; + + /** + * The feature id for the '<em><b>Cases</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ETYPED_ELEMENT_SWITCH_QUERY__CASES = ExtensiblePackage.QUERY_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>ETyped Element Switch Query</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ETYPED_ELEMENT_SWITCH_QUERY_FEATURE_COUNT = ExtensiblePackage.QUERY_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl <em>ETyped Element Case</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementCase() + * @generated + */ + int ETYPED_ELEMENT_CASE = 4; + + /** + * The feature id for the '<em><b>Case</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ETYPED_ELEMENT_CASE__CASE = 0; + + /** + * The feature id for the '<em><b>Value</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ETYPED_ELEMENT_CASE__VALUE = 1; + + /** + * The number of structural features of the '<em>ETyped Element Case</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int ETYPED_ELEMENT_CASE_FEATURE_COUNT = 2; + + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization <em>Customization</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Customization</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization + * @generated + */ + EClass getCustomization(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#isMustBeLoadedByDefault <em>Must Be Loaded By Default</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Must Be Loaded By Default</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#isMustBeLoadedByDefault() + * @see #getCustomization() + * @generated + */ + EAttribute getCustomization_MustBeLoadedByDefault(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#getRank <em>Rank</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Rank</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization#getRank() + * @see #getCustomization() + * @generated + */ + EAttribute getCustomization_Rank(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization <em>EClass Customization</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>EClass Customization</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization + * @generated + */ + EClass getEClassCustomization(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization <em>Facet Customization</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Facet Customization</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization + * @generated + */ + EClass getFacetCustomization(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization#getCustomizedFacet <em>Customized Facet</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference '<em>Customized Facet</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization#getCustomizedFacet() + * @see #getFacetCustomization() + * @generated + */ + EReference getFacetCustomization_CustomizedFacet(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery <em>ETyped Element Switch Query</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>ETyped Element Switch Query</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery + * @generated + */ + EClass getETypedElementSwitchQuery(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery#getCases <em>Cases</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the containment reference list '<em>Cases</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery#getCases() + * @see #getETypedElementSwitchQuery() + * @generated + */ + EReference getETypedElementSwitchQuery_Cases(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase <em>ETyped Element Case</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>ETyped Element Case</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase + * @generated + */ + EClass getETypedElementCase(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getCase <em>Case</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference '<em>Case</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getCase() + * @see #getETypedElementCase() + * @generated + */ + EReference getETypedElementCase_Case(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getValue <em>Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the containment reference '<em>Value</em>'. + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase#getValue() + * @see #getETypedElementCase() + * @generated + */ + EReference getETypedElementCase_Value(); + + /** + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the factory that creates the instances of the model. + * @generated + */ + CustomFactory getCustomFactory(); + + /** + * <!-- begin-user-doc --> + * Defines literals for the meta objects that represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + * <!-- end-user-doc --> + * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl <em>Customization</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomizationImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getCustomization() + * @generated + */ + EClass CUSTOMIZATION = eINSTANCE.getCustomization(); + + /** + * The meta object literal for the '<em><b>Must Be Loaded By Default</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EAttribute CUSTOMIZATION__MUST_BE_LOADED_BY_DEFAULT = eINSTANCE.getCustomization_MustBeLoadedByDefault(); + + /** + * The meta object literal for the '<em><b>Rank</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EAttribute CUSTOMIZATION__RANK = eINSTANCE.getCustomization_Rank(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl <em>EClass Customization</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.EClassCustomizationImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getEClassCustomization() + * @generated + */ + EClass ECLASS_CUSTOMIZATION = eINSTANCE.getEClassCustomization(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl <em>Facet Customization</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.FacetCustomizationImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getFacetCustomization() + * @generated + */ + EClass FACET_CUSTOMIZATION = eINSTANCE.getFacetCustomization(); + + /** + * The meta object literal for the '<em><b>Customized Facet</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET_CUSTOMIZATION__CUSTOMIZED_FACET = eINSTANCE.getFacetCustomization_CustomizedFacet(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl <em>ETyped Element Switch Query</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementSwitchQueryImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementSwitchQuery() + * @generated + */ + EClass ETYPED_ELEMENT_SWITCH_QUERY = eINSTANCE.getETypedElementSwitchQuery(); + + /** + * The meta object literal for the '<em><b>Cases</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference ETYPED_ELEMENT_SWITCH_QUERY__CASES = eINSTANCE.getETypedElementSwitchQuery_Cases(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl <em>ETyped Element Case</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.ETypedElementCaseImpl + * @see org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.impl.CustomPackageImpl#getETypedElementCase() + * @generated + */ + EClass ETYPED_ELEMENT_CASE = eINSTANCE.getETypedElementCase(); + + /** + * The meta object literal for the '<em><b>Case</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference ETYPED_ELEMENT_CASE__CASE = eINSTANCE.getETypedElementCase_Case(); + + /** + * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference ETYPED_ELEMENT_CASE__VALUE = eINSTANCE.getETypedElementCase_Value(); + + } + +} // CustomPackage diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.project index 3ff36754c10..aea45b915c0 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.project @@ -1,30 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.sdk.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.sdk.core</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF index 0e970649be9..16cf2de08f6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF @@ -1,21 +1,17 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.custom.sdk.core,
- org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.validation;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.validation;bundle-version="1.4.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.common.sdk.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.Activator
-Bundle-ManifestVersion: 2
-Import-Package: org.eclipse.emf.edit.command,
- org.eclipse.emf.edit.domain
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.sdk.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.custom.sdk.core, + org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.validation;x-internal:=true +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.common.sdk.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.sdk.core;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.project index e329e952c1d..727c0100853 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.project @@ -1,28 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.sdk.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.sdk.ui</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF index 5cc28706fae..2650d9da01d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF @@ -1,29 +1,19 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.swt;bundle-version="3.6.0",
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.custom.sdk.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.core.expressions;bundle-version="3.4.200"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.sdk.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.sdk.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.efacet.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.sdk.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.project index 7cc4c2e66be..a0d24967262 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.project @@ -1,31 +1,44 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.custom.ui</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.custom.ui</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF index e895e11360e..7a0b242fad5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF @@ -1,28 +1,25 @@ -Manifest-Version: 1.0
-Service-Component: OSGI-INF/component.xml
-Export-Package: org.eclipse.papyrus.emf.facet.custom.ui,
- org.eclipse.papyrus.emf.facet.custom.ui.internal,
- org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt,
- org.eclipse.papyrus.emf.facet.custom.ui.internal.exported,
- org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog,
- org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception,
- org.eclipse.papyrus.emf.facet.custom.ui.internal.query
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.jface.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Service-Component: OSGI-INF/component.xml +Export-Package: org.eclipse.papyrus.emf.facet.custom.ui, + org.eclipse.papyrus.emf.facet.custom.ui.internal, + org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt, + org.eclipse.papyrus.emf.facet.custom.ui.internal.exported, + org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog, + org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception, + org.eclipse.papyrus.emf.facet.custom.ui.internal.query +Require-Bundle: org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)", + org.eclipse.papyrus.emf.facet.util.swt;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.jface.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.project index 022c84d4f19..6b02eb9223e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.catalog</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.catalog</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF index a1aa7d034b6..0fa08f90a39 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF @@ -1,16 +1,14 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.catalog.plugin.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.catalog;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.catalog.plugin.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.catalog;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.project index 36917046a94..2955c632b38 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.project @@ -1,31 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.core</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF index dc10e6b24d9..97596d15b92 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF @@ -1,26 +1,23 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.core,
- org.eclipse.papyrus.emf.facet.efacet.core.exception,
- org.eclipse.papyrus.emf.facet.efacet.core.internal.exported,
- org.eclipse.papyrus.emf.facet.efacet.core.internal.incubatingapi,
- org.eclipse.papyrus.emf.facet.efacet.core.internal.query,
- org.eclipse.papyrus.emf.facet.efacet.core.query
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.efacet.catalog;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet.core, + org.eclipse.papyrus.emf.facet.efacet.core.exception, + org.eclipse.papyrus.emf.facet.efacet.core.internal.exported, + org.eclipse.papyrus.emf.facet.efacet.core.internal.incubatingapi, + org.eclipse.papyrus.emf.facet.efacet.core.internal.query, + org.eclipse.papyrus.emf.facet.efacet.core.query +Require-Bundle: org.eclipse.papyrus.emf.facet.efacet.catalog;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.core;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/.project index df9aad2102e..35afe3cf8c3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/.project @@ -37,8 +37,26 @@ </dictionary> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/META-INF/MANIFEST.MF index a235d5429c1..84e3b2fb036 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.doc;singleton:=true diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.project index bfc9dcc44d2..92814434a43 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.edit</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF index 2bbc23a384a..d807a3ea463 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore.edit,
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.provider.EfacetEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.papyrus.emf.facet.efacet;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.emf.facet.efacet.provider +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.provider.EfacetEditPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.project index 5c7e1481bd7..e8eb78cf708 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.project @@ -1,28 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.editor</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.editor</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF index 1b78be8db45..a5246f4704b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF @@ -1,20 +1,20 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.presentation;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.papyrus.emf.facet.efacet.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.ui.ide,
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0",
- org.eclipse.emf.ecore.edit;bundle-version="2.6.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.presentation.EfacetEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet.presentation;x-internal:=true +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.presentation.EfacetEditorPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.project index e145f72414f..38026273c33 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.project @@ -1,28 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.metamodel.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.metamodel.edit</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.settings/.api_filters b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.settings/.api_filters new file mode 100644 index 00000000000..08f00933360 --- /dev/null +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.emf.facet.efacet.metamodel.edit" version="2"> + <resource path="src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java" type="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.FacetItemProvider"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.FacetItemProvider"/> + <message_argument value="addInstanceClassPropertyDescriptor(Object)"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF index 9c57cc8b3fb..1f98e2cd17f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF @@ -1,22 +1,22 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.provider,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.provider,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.provider,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.catalog;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.Efacet2EditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.provider, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.provider, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.provider, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.provider +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.Efacet2EditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java index 89ab119e990..66229b79261 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java @@ -1,354 +1,356 @@ -/**
- * Copyright (c) 2011 Mia-Software.
- *
- * 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:
- * Gregoire Dupe (Mia-Software) - Design
- * Nicolas Guyomar (Mia-Software) - Implementation
- * Emmanuelle Rouill� (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.
- * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model
- * Gregoire Dupe (Mia-Software) - Bug 366055 - NavigationQuery
- * Gregoire Dupe (Mia-Software) - Bug 369673 - [Facet] IsOneOfQuery
- * Olivier Remaud (Soft-Maint) - Bug 369824 - Add a simple way to return string literal constants from a customization query
- * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
- * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet
- */
-package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.provider.EClassifierItemProvider;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class FacetItemProvider
- extends EClassifierItemProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public FacetItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDocumentationPropertyDescriptor(object);
- addExtendedMetaclassPropertyDescriptor(object);
- addConformanceTypedElementPropertyDescriptor(object);
- addExtendedFacetsPropertyDescriptor(object);
- addAllTypedElementsPropertyDescriptor(object);
- addAllFacetOperationsPropertyDescriptor(object);
- addAllFacetElementsPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Documentation feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDocumentationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_DocumentedElement_documentation_feature", "_UI_DocumentedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EFacetPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Extended Metaclass feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addExtendedMetaclassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Facet_extendedMetaclass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Facet_extendedMetaclass_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EFacetPackage.Literals.FACET__EXTENDED_METACLASS,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Conformance Typed Element feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConformanceTypedElementPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Facet_conformanceTypedElement_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Facet_conformanceTypedElement_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EFacetPackage.Literals.FACET__CONFORMANCE_TYPED_ELEMENT,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Extended Facets feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addExtendedFacetsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Facet_extendedFacets_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Facet_extendedFacets_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EFacetPackage.Literals.FACET__EXTENDED_FACETS,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the All Typed Elements feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAllTypedElementsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Facet_allTypedElements_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Facet_allTypedElements_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EFacetPackage.Literals.FACET__ALL_TYPED_ELEMENTS,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the All Facet Operations feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAllFacetOperationsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Facet_allFacetOperations_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Facet_allFacetOperations_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EFacetPackage.Literals.FACET__ALL_FACET_OPERATIONS,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the All Facet Elements feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAllFacetElementsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Facet_allFacetElements_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Facet_allFacetElements_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EFacetPackage.Literals.FACET__ALL_FACET_ELEMENTS,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(EFacetPackage.Literals.FACET__FACET_ELEMENTS);
- childrenFeatures.add(EFacetPackage.Literals.FACET__FACET_OPERATIONS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns Facet.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Facet")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((Facet) object).getName();
- return label == null || label.length() == 0 ? getString("_UI_Facet_type") //$NON-NLS-1$
- :
- getString("_UI_Facet_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(Facet.class)) {
- case EFacetPackage.FACET__DOCUMENTATION:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case EFacetPackage.FACET__FACET_ELEMENTS:
- case EFacetPackage.FACET__FACET_OPERATIONS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS,
- EFacetFactory.eINSTANCE.createFacetAttribute()));
-
- newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS,
- EFacetFactory.eINSTANCE.createFacetReference()));
-
- newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS,
- EcoreFactory.eINSTANCE.createEAttribute()));
-
- newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS,
- EcoreFactory.eINSTANCE.createEReference()));
-
- newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_OPERATIONS,
- EFacetFactory.eINSTANCE.createFacetOperation()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Efacet2EditPlugin.INSTANCE;
- }
-
-}
+/** + * Copyright (c) 2011 Mia-Software. + * + * 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: + * Gregoire Dupe (Mia-Software) - Design + * Nicolas Guyomar (Mia-Software) - Implementation + * Emmanuelle Rouill� (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. + * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model + * Gregoire Dupe (Mia-Software) - Bug 366055 - NavigationQuery + * Gregoire Dupe (Mia-Software) - Bug 369673 - [Facet] IsOneOfQuery + * Olivier Remaud (Soft-Maint) - Bug 369824 - Add a simple way to return string literal constants from a customization query + * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning + * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet + */ +package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider; + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.emf.ecore.provider.EClassifierItemProvider; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ +public class FacetItemProvider + extends EClassifierItemProvider { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public FacetItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addDocumentationPropertyDescriptor(object); + addExtendedMetaclassPropertyDescriptor(object); + addConformanceTypedElementPropertyDescriptor(object); + addExtendedFacetsPropertyDescriptor(object); + addAllTypedElementsPropertyDescriptor(object); + addAllFacetOperationsPropertyDescriptor(object); + addAllFacetElementsPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Documentation feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void addDocumentationPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_DocumentedElement_documentation_feature", "_UI_DocumentedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EFacetPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Extended Metaclass feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void addExtendedMetaclassPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Facet_extendedMetaclass_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Facet_extendedMetaclass_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EFacetPackage.Literals.FACET__EXTENDED_METACLASS, + true, + false, + true, + null, + null, + null)); + } + + /** + * This adds a property descriptor for the Conformance Typed Element feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void addConformanceTypedElementPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Facet_conformanceTypedElement_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Facet_conformanceTypedElement_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EFacetPackage.Literals.FACET__CONFORMANCE_TYPED_ELEMENT, + true, + false, + true, + null, + null, + null)); + } + + /** + * This adds a property descriptor for the Extended Facets feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void addExtendedFacetsPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Facet_extendedFacets_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Facet_extendedFacets_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EFacetPackage.Literals.FACET__EXTENDED_FACETS, + true, + false, + true, + null, + null, + null)); + } + + /** + * This adds a property descriptor for the All Typed Elements feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + protected void addAllTypedElementsPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Facet_allTypedElements_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Facet_allTypedElements_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EFacetPackage.Literals.FACET__ALL_TYPED_ELEMENTS, + false, + false, + false, + null, + null, + null)); + } + + /** + * This adds a property descriptor for the All Facet Operations feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + protected void addAllFacetOperationsPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Facet_allFacetOperations_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Facet_allFacetOperations_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EFacetPackage.Literals.FACET__ALL_FACET_OPERATIONS, + false, + false, + false, + null, + null, + null)); + } + + /** + * This adds a property descriptor for the All Facet Elements feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + protected void addAllFacetElementsPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Facet_allFacetElements_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Facet_allFacetElements_feature", "_UI_Facet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + EFacetPackage.Literals.FACET__ALL_FACET_ELEMENTS, + false, + false, + false, + null, + null, + null)); + } + + /** + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { + if (childrenFeatures == null) { + super.getChildrenFeatures(object); + childrenFeatures.add(EFacetPackage.Literals.FACET__FACET_ELEMENTS); + childrenFeatures.add(EFacetPackage.Literals.FACET__FACET_OPERATIONS); + } + return childrenFeatures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** + * This returns Facet.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/Facet")); //$NON-NLS-1$ + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getText(Object object) { + String label = ((Facet) object).getName(); + return label == null || label.length() == 0 ? getString("_UI_Facet_type") //$NON-NLS-1$ + : getString("_UI_Facet_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(Facet.class)) { + case EFacetPackage.FACET__DOCUMENTATION: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + case EFacetPackage.FACET__FACET_ELEMENTS: + case EFacetPackage.FACET__FACET_OPERATIONS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS, + EFacetFactory.eINSTANCE.createFacetAttribute())); + + newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS, + EFacetFactory.eINSTANCE.createFacetReference())); + + newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS, + EcoreFactory.eINSTANCE.createEAttribute())); + + newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS, + EcoreFactory.eINSTANCE.createEReference())); + + newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_OPERATIONS, + EFacetFactory.eINSTANCE.createFacetOperation())); + } + + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return Efacet2EditPlugin.INSTANCE; + } + +} diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.project index 3cc87a34c64..b1051f886f7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.project @@ -1,28 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.metamodel</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.metamodel</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.settings/.api_filters b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.settings/.api_filters index 3f214d76590..07420648e25 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.settings/.api_filters +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.settings/.api_filters @@ -1,95 +1,32 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.papyrus.emf.facet.efacet.metamodel" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter comment="This API break has been allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577" id="924844039">
- <message_arguments>
- <message_argument value="0.2.0"/>
- <message_argument value="0.2.0"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java" type="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage">
- <filter comment="This an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage"/>
- <message_argument value="FACET__EXTENDED_FACETS"/>
- </message_arguments>
- </filter>
- <filter comment="This an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="403804204">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage"/>
- <message_argument value="getFacet_ExtendedFacets()"/>
- </message_arguments>
- </filter>
- <filter comment="This an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="405864542">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage"/>
- <message_argument value="FACET__EXTENDED_FACET"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java" type="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet">
- <filter comment="This is an allowed (by modeling PMC) API break. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376576" id="405901410">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet"/>
- <message_argument value="setExtendedFacet(Facet)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java" type="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage$Literals">
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="EOBJECT_LITERAL_QUERY"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="EOBJECT_LITERAL_QUERY__ELEMENT"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="FLOAT_LITERAL_QUERY"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="FLOAT_LITERAL_QUERY__VALUE"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="INTEGER_LITERAL_QUERY"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="INTEGER_LITERAL_QUERY__VALUE"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="OPERATION_CALL_QUERY"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="OPERATION_CALL_QUERY__ARGUMENTS"/>
- </message_arguments>
- </filter>
- <filter comment="API break allowed by the modeling PMC. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=376577)" id="403767336">
- <message_arguments>
- <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage.Literals"/>
- <message_argument value="OPERATION_CALL_QUERY__OPERATION"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.emf.facet.efacet.metamodel" version="2"> + <resource path="src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java" type="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage"> + <filter comment="EMF package interfaces are not intended to be implemented or extended by clients" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage"/> + <message_argument value="FACET_FEATURE_COUNT"/> + <message_argument value="14"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java" type="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage$Literals"> + <filter comment="EMF package interfaces are not intended to be implemented or extended by clients" id="403767336"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage.Literals"/> + <message_argument value="FACET__ALL_FACET_ELEMENTS"/> + </message_arguments> + </filter> + <filter comment="EMF package interfaces are not intended to be implemented or extended by clients" id="403767336"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage.Literals"/> + <message_argument value="FACET__ALL_FACET_OPERATIONS"/> + </message_arguments> + </filter> + <filter comment="EMF package interfaces are not intended to be implemented or extended by clients" id="403767336"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage.Literals"/> + <message_argument value="FACET__ALL_TYPED_ELEMENTS"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF index 05645683e86..d2ab784ed8a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF @@ -1,31 +1,31 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.util,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.impl,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.util,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.impl,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.util,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.impl,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.util,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.util,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.catalog;visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.util, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.impl, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.util, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.impl, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.util, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.impl, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.util, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.util, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl, + org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.util +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java index 5503ee4d8c2..d84b4225deb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java @@ -1,2187 +1,2199 @@ -/**
- * Copyright (c) 2011, 2012 Mia-Software.
- *
- * 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:
- * Gregoire Dupe (Mia-Software) - Design
- * Nicolas Guyomar (Mia-Software) - Implementation
- * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.
- * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model
- * Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.
- * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
- * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet
- */
-package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory
- * @model kind="package"
- * annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='org.eclipse.ocl.ecore.OCL'"
- * @generated
- */
-public interface EFacetPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "efacet"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "efacet"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EFacetPackage eINSTANCE = org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl <em>Facet Attribute</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetAttribute()
- * @generated
- */
- int FACET_ATTRIBUTE = 0;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__EANNOTATIONS = EcorePackage.EATTRIBUTE__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__NAME = EcorePackage.EATTRIBUTE__NAME;
-
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__ORDERED = EcorePackage.EATTRIBUTE__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__UNIQUE = EcorePackage.EATTRIBUTE__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__LOWER_BOUND = EcorePackage.EATTRIBUTE__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__UPPER_BOUND = EcorePackage.EATTRIBUTE__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__MANY = EcorePackage.EATTRIBUTE__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__REQUIRED = EcorePackage.EATTRIBUTE__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__ETYPE = EcorePackage.EATTRIBUTE__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__EGENERIC_TYPE = EcorePackage.EATTRIBUTE__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>Changeable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__CHANGEABLE = EcorePackage.EATTRIBUTE__CHANGEABLE;
-
- /**
- * The feature id for the '<em><b>Volatile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__VOLATILE = EcorePackage.EATTRIBUTE__VOLATILE;
-
- /**
- * The feature id for the '<em><b>Transient</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__TRANSIENT = EcorePackage.EATTRIBUTE__TRANSIENT;
-
- /**
- * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__DEFAULT_VALUE_LITERAL = EcorePackage.EATTRIBUTE__DEFAULT_VALUE_LITERAL;
-
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__DEFAULT_VALUE = EcorePackage.EATTRIBUTE__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Unsettable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__UNSETTABLE = EcorePackage.EATTRIBUTE__UNSETTABLE;
-
- /**
- * The feature id for the '<em><b>Derived</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__DERIVED = EcorePackage.EATTRIBUTE__DERIVED;
-
- /**
- * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__ECONTAINING_CLASS = EcorePackage.EATTRIBUTE__ECONTAINING_CLASS;
-
- /**
- * The feature id for the '<em><b>ID</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__ID = EcorePackage.EATTRIBUTE__ID;
-
- /**
- * The feature id for the '<em><b>EAttribute Type</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__EATTRIBUTE_TYPE = EcorePackage.EATTRIBUTE__EATTRIBUTE_TYPE;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__DOCUMENTATION = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Categories</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__CATEGORIES = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Query</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__QUERY = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Override</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE__OVERRIDE = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 3;
-
- /**
- * The number of structural features of the '<em>Facet Attribute</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ATTRIBUTE_FEATURE_COUNT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl <em>Facet Reference</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetReference()
- * @generated
- */
- int FACET_REFERENCE = 1;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__EANNOTATIONS = EcorePackage.EREFERENCE__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__NAME = EcorePackage.EREFERENCE__NAME;
-
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__ORDERED = EcorePackage.EREFERENCE__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__UNIQUE = EcorePackage.EREFERENCE__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__LOWER_BOUND = EcorePackage.EREFERENCE__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__UPPER_BOUND = EcorePackage.EREFERENCE__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__MANY = EcorePackage.EREFERENCE__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__REQUIRED = EcorePackage.EREFERENCE__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__ETYPE = EcorePackage.EREFERENCE__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__EGENERIC_TYPE = EcorePackage.EREFERENCE__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>Changeable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__CHANGEABLE = EcorePackage.EREFERENCE__CHANGEABLE;
-
- /**
- * The feature id for the '<em><b>Volatile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__VOLATILE = EcorePackage.EREFERENCE__VOLATILE;
-
- /**
- * The feature id for the '<em><b>Transient</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__TRANSIENT = EcorePackage.EREFERENCE__TRANSIENT;
-
- /**
- * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__DEFAULT_VALUE_LITERAL = EcorePackage.EREFERENCE__DEFAULT_VALUE_LITERAL;
-
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__DEFAULT_VALUE = EcorePackage.EREFERENCE__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Unsettable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__UNSETTABLE = EcorePackage.EREFERENCE__UNSETTABLE;
-
- /**
- * The feature id for the '<em><b>Derived</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__DERIVED = EcorePackage.EREFERENCE__DERIVED;
-
- /**
- * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__ECONTAINING_CLASS = EcorePackage.EREFERENCE__ECONTAINING_CLASS;
-
- /**
- * The feature id for the '<em><b>Containment</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__CONTAINMENT = EcorePackage.EREFERENCE__CONTAINMENT;
-
- /**
- * The feature id for the '<em><b>Container</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__CONTAINER = EcorePackage.EREFERENCE__CONTAINER;
-
- /**
- * The feature id for the '<em><b>Resolve Proxies</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__RESOLVE_PROXIES = EcorePackage.EREFERENCE__RESOLVE_PROXIES;
-
- /**
- * The feature id for the '<em><b>EOpposite</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__EOPPOSITE = EcorePackage.EREFERENCE__EOPPOSITE;
-
- /**
- * The feature id for the '<em><b>EReference Type</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__EREFERENCE_TYPE = EcorePackage.EREFERENCE__EREFERENCE_TYPE;
-
- /**
- * The feature id for the '<em><b>EKeys</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__EKEYS = EcorePackage.EREFERENCE__EKEYS;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__DOCUMENTATION = EcorePackage.EREFERENCE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Categories</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__CATEGORIES = EcorePackage.EREFERENCE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Query</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__QUERY = EcorePackage.EREFERENCE_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Override</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE__OVERRIDE = EcorePackage.EREFERENCE_FEATURE_COUNT + 3;
-
- /**
- * The number of structural features of the '<em>Facet Reference</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_REFERENCE_FEATURE_COUNT = EcorePackage.EREFERENCE_FEATURE_COUNT + 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl <em>Facet Operation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetOperation()
- * @generated
- */
- int FACET_OPERATION = 2;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__NAME = EcorePackage.EOPERATION__NAME;
-
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__ORDERED = EcorePackage.EOPERATION__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__UNIQUE = EcorePackage.EOPERATION__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__MANY = EcorePackage.EOPERATION__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__REQUIRED = EcorePackage.EOPERATION__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__ETYPE = EcorePackage.EOPERATION__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__EGENERIC_TYPE = EcorePackage.EOPERATION__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__ECONTAINING_CLASS = EcorePackage.EOPERATION__ECONTAINING_CLASS;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__ETYPE_PARAMETERS = EcorePackage.EOPERATION__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>EParameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__EPARAMETERS = EcorePackage.EOPERATION__EPARAMETERS;
-
- /**
- * The feature id for the '<em><b>EExceptions</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS;
-
- /**
- * The feature id for the '<em><b>EGeneric Exceptions</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__EGENERIC_EXCEPTIONS = EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__DOCUMENTATION = EcorePackage.EOPERATION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Categories</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__CATEGORIES = EcorePackage.EOPERATION_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Query</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__QUERY = EcorePackage.EOPERATION_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Override</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION__OVERRIDE = EcorePackage.EOPERATION_FEATURE_COUNT + 3;
-
- /**
- * The number of structural features of the '<em>Facet Operation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_OPERATION_FEATURE_COUNT = EcorePackage.EOPERATION_FEATURE_COUNT + 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl <em>Facet Set</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetSet()
- * @generated
- */
- int FACET_SET = 3;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__EANNOTATIONS = EcorePackage.EPACKAGE__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__NAME = EcorePackage.EPACKAGE__NAME;
-
- /**
- * The feature id for the '<em><b>Ns URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__NS_URI = EcorePackage.EPACKAGE__NS_URI;
-
- /**
- * The feature id for the '<em><b>Ns Prefix</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__NS_PREFIX = EcorePackage.EPACKAGE__NS_PREFIX;
-
- /**
- * The feature id for the '<em><b>EFactory Instance</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__EFACTORY_INSTANCE = EcorePackage.EPACKAGE__EFACTORY_INSTANCE;
-
- /**
- * The feature id for the '<em><b>EClassifiers</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__ECLASSIFIERS = EcorePackage.EPACKAGE__ECLASSIFIERS;
-
- /**
- * The feature id for the '<em><b>ESubpackages</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__ESUBPACKAGES = EcorePackage.EPACKAGE__ESUBPACKAGES;
-
- /**
- * The feature id for the '<em><b>ESuper Package</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__ESUPER_PACKAGE = EcorePackage.EPACKAGE__ESUPER_PACKAGE;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__DOCUMENTATION = EcorePackage.EPACKAGE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Categories</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET__CATEGORIES = EcorePackage.EPACKAGE_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Facet Set</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_SET_FEATURE_COUNT = EcorePackage.EPACKAGE_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl <em>Facet</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacet()
- * @generated
- */
- int FACET = 4;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__EANNOTATIONS = EcorePackage.ECLASSIFIER__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__NAME = EcorePackage.ECLASSIFIER__NAME;
-
- /**
- * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__INSTANCE_CLASS_NAME = EcorePackage.ECLASSIFIER__INSTANCE_CLASS_NAME;
-
- /**
- * The feature id for the '<em><b>Instance Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__INSTANCE_CLASS = EcorePackage.ECLASSIFIER__INSTANCE_CLASS;
-
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__DEFAULT_VALUE = EcorePackage.ECLASSIFIER__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Instance Type Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__INSTANCE_TYPE_NAME = EcorePackage.ECLASSIFIER__INSTANCE_TYPE_NAME;
-
- /**
- * The feature id for the '<em><b>EPackage</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__EPACKAGE = EcorePackage.ECLASSIFIER__EPACKAGE;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__ETYPE_PARAMETERS = EcorePackage.ECLASSIFIER__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__DOCUMENTATION = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Extended Metaclass</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__EXTENDED_METACLASS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Facet Elements</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__FACET_ELEMENTS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Facet Operations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__FACET_OPERATIONS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Conformance Typed Element</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__CONFORMANCE_TYPED_ELEMENT = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Extended Facets</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__EXTENDED_FACETS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>All Typed Elements</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__ALL_TYPED_ELEMENTS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>All Facet Operations</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__ALL_FACET_OPERATIONS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>All Facet Elements</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET__ALL_FACET_ELEMENTS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 8;
-
- /**
- * The number of structural features of the '<em>Facet</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_FEATURE_COUNT = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl <em>Category</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getCategory()
- * @generated
- */
- int CATEGORY = 5;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CATEGORY__EANNOTATIONS = EcorePackage.ENAMED_ELEMENT__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CATEGORY__NAME = EcorePackage.ENAMED_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CATEGORY__DOCUMENTATION = EcorePackage.ENAMED_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Category</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int CATEGORY_FEATURE_COUNT = EcorePackage.ENAMED_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl <em>Facet Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetElement()
- * @generated
- */
- int FACET_ELEMENT = 6;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__EANNOTATIONS = EcorePackage.ETYPED_ELEMENT__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__NAME = EcorePackage.ETYPED_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__ORDERED = EcorePackage.ETYPED_ELEMENT__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__UNIQUE = EcorePackage.ETYPED_ELEMENT__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__LOWER_BOUND = EcorePackage.ETYPED_ELEMENT__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__UPPER_BOUND = EcorePackage.ETYPED_ELEMENT__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__MANY = EcorePackage.ETYPED_ELEMENT__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__REQUIRED = EcorePackage.ETYPED_ELEMENT__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__ETYPE = EcorePackage.ETYPED_ELEMENT__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__EGENERIC_TYPE = EcorePackage.ETYPED_ELEMENT__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__DOCUMENTATION = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Categories</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT__CATEGORIES = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Facet Element</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int FACET_ELEMENT_FEATURE_COUNT = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl <em>Derived Typed Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDerivedTypedElement()
- * @generated
- */
- int DERIVED_TYPED_ELEMENT = 7;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__EANNOTATIONS = FACET_ELEMENT__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__NAME = FACET_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__ORDERED = FACET_ELEMENT__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__UNIQUE = FACET_ELEMENT__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__LOWER_BOUND = FACET_ELEMENT__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__UPPER_BOUND = FACET_ELEMENT__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__MANY = FACET_ELEMENT__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__REQUIRED = FACET_ELEMENT__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__ETYPE = FACET_ELEMENT__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__EGENERIC_TYPE = FACET_ELEMENT__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__DOCUMENTATION = FACET_ELEMENT__DOCUMENTATION;
-
- /**
- * The feature id for the '<em><b>Categories</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__CATEGORIES = FACET_ELEMENT__CATEGORIES;
-
- /**
- * The feature id for the '<em><b>Query</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__QUERY = FACET_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Override</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT__OVERRIDE = FACET_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Derived Typed Element</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DERIVED_TYPED_ELEMENT_FEATURE_COUNT = FACET_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl <em>Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getParameterValue()
- * @generated
- */
- int PARAMETER_VALUE = 8;
-
- /**
- * The feature id for the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PARAMETER_VALUE__PARAMETER = 0;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PARAMETER_VALUE__VALUE = 1;
-
- /**
- * The number of structural features of the '<em>Parameter Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PARAMETER_VALUE_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl <em>Documented Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDocumentedElement()
- * @generated
- */
- int DOCUMENTED_ELEMENT = 9;
-
- /**
- * The feature id for the '<em><b>Documentation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DOCUMENTED_ELEMENT__DOCUMENTATION = 0;
-
- /**
- * The number of structural features of the '<em>Documented Element</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DOCUMENTED_ELEMENT_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '<em>Resource</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.ecore.resource.Resource
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getResource()
- * @generated
- */
- int RESOURCE = 10;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute <em>Facet Attribute</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Facet Attribute</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute
- * @generated
- */
- EClass getFacetAttribute();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference <em>Facet Reference</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Facet Reference</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference
- * @generated
- */
- EClass getFacetReference();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation <em>Facet Operation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Facet Operation</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation
- * @generated
- */
- EClass getFacetOperation();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet <em>Facet Set</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Facet Set</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet
- * @generated
- */
- EClass getFacetSet();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet#getCategories <em>Categories</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Categories</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet#getCategories()
- * @see #getFacetSet()
- * @generated
- */
- EReference getFacetSet_Categories();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet <em>Facet</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Facet</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet
- * @generated
- */
- EClass getFacet();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass <em>Extended Metaclass</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Extended Metaclass</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_ExtendedMetaclass();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetElements <em>Facet Elements</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Facet Elements</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetElements()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_FacetElements();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetOperations <em>Facet Operations</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Facet Operations</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetOperations()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_FacetOperations();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement <em>Conformance Typed Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Conformance Typed Element</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_ConformanceTypedElement();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedFacets <em>Extended Facets</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Extended Facets</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedFacets()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_ExtendedFacets();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllTypedElements <em>All Typed Elements</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>All Typed Elements</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllTypedElements()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_AllTypedElements();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetOperations <em>All Facet Operations</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>All Facet Operations</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetOperations()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_AllFacetOperations();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetElements <em>All Facet Elements</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>All Facet Elements</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetElements()
- * @see #getFacet()
- * @generated
- */
- EReference getFacet_AllFacetElements();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Category <em>Category</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Category</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Category
- * @generated
- */
- EClass getCategory();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement <em>Facet Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Facet Element</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement
- * @generated
- */
- EClass getFacetElement();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement#getCategories <em>Categories</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Categories</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement#getCategories()
- * @see #getFacetElement()
- * @generated
- */
- EReference getFacetElement_Categories();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement <em>Derived Typed Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Derived Typed Element</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement
- * @generated
- */
- EClass getDerivedTypedElement();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getQuery <em>Query</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference '<em>Query</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getQuery()
- * @see #getDerivedTypedElement()
- * @generated
- */
- EReference getDerivedTypedElement_Query();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getOverride <em>Override</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Override</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getOverride()
- * @see #getDerivedTypedElement()
- * @generated
- */
- EReference getDerivedTypedElement_Override();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue <em>Parameter Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Parameter Value</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue
- * @generated
- */
- EClass getParameterValue();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getParameter <em>Parameter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Parameter</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getParameter()
- * @see #getParameterValue()
- * @generated
- */
- EReference getParameterValue_Parameter();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getValue <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Value</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getValue()
- * @see #getParameterValue()
- * @generated
- */
- EAttribute getParameterValue_Value();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement <em>Documented Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Documented Element</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement
- * @generated
- */
- EClass getDocumentedElement();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement#getDocumentation <em>Documentation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Documentation</em>'.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement#getDocumentation()
- * @see #getDocumentedElement()
- * @generated
- */
- EAttribute getDocumentedElement_Documentation();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource <em>Resource</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for data type '<em>Resource</em>'.
- * @see org.eclipse.emf.ecore.resource.Resource
- * @model instanceClass="org.eclipse.emf.ecore.resource.Resource"
- * @generated
- */
- EDataType getResource();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- EFacetFactory getEFacetFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl <em>Facet Attribute</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetAttribute()
- * @generated
- */
- EClass FACET_ATTRIBUTE = eINSTANCE.getFacetAttribute();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl <em>Facet Reference</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetReference()
- * @generated
- */
- EClass FACET_REFERENCE = eINSTANCE.getFacetReference();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl <em>Facet Operation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetOperation()
- * @generated
- */
- EClass FACET_OPERATION = eINSTANCE.getFacetOperation();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl <em>Facet Set</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetSet()
- * @generated
- */
- EClass FACET_SET = eINSTANCE.getFacetSet();
-
- /**
- * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET_SET__CATEGORIES = eINSTANCE.getFacetSet_Categories();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl <em>Facet</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacet()
- * @generated
- */
- EClass FACET = eINSTANCE.getFacet();
-
- /**
- * The meta object literal for the '<em><b>Extended Metaclass</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__EXTENDED_METACLASS = eINSTANCE.getFacet_ExtendedMetaclass();
-
- /**
- * The meta object literal for the '<em><b>Facet Elements</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__FACET_ELEMENTS = eINSTANCE.getFacet_FacetElements();
-
- /**
- * The meta object literal for the '<em><b>Facet Operations</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__FACET_OPERATIONS = eINSTANCE.getFacet_FacetOperations();
-
- /**
- * The meta object literal for the '<em><b>Conformance Typed Element</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__CONFORMANCE_TYPED_ELEMENT = eINSTANCE.getFacet_ConformanceTypedElement();
-
- /**
- * The meta object literal for the '<em><b>Extended Facets</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__EXTENDED_FACETS = eINSTANCE.getFacet_ExtendedFacets();
-
- /**
- * The meta object literal for the '<em><b>All Typed Elements</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__ALL_TYPED_ELEMENTS = eINSTANCE.getFacet_AllTypedElements();
-
- /**
- * The meta object literal for the '<em><b>All Facet Operations</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__ALL_FACET_OPERATIONS = eINSTANCE.getFacet_AllFacetOperations();
-
- /**
- * The meta object literal for the '<em><b>All Facet Elements</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET__ALL_FACET_ELEMENTS = eINSTANCE.getFacet_AllFacetElements();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl <em>Category</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getCategory()
- * @generated
- */
- EClass CATEGORY = eINSTANCE.getCategory();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl <em>Facet Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetElement()
- * @generated
- */
- EClass FACET_ELEMENT = eINSTANCE.getFacetElement();
-
- /**
- * The meta object literal for the '<em><b>Categories</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference FACET_ELEMENT__CATEGORIES = eINSTANCE.getFacetElement_Categories();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl <em>Derived Typed Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDerivedTypedElement()
- * @generated
- */
- EClass DERIVED_TYPED_ELEMENT = eINSTANCE.getDerivedTypedElement();
-
- /**
- * The meta object literal for the '<em><b>Query</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference DERIVED_TYPED_ELEMENT__QUERY = eINSTANCE.getDerivedTypedElement_Query();
-
- /**
- * The meta object literal for the '<em><b>Override</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference DERIVED_TYPED_ELEMENT__OVERRIDE = eINSTANCE.getDerivedTypedElement_Override();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl <em>Parameter Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getParameterValue()
- * @generated
- */
- EClass PARAMETER_VALUE = eINSTANCE.getParameterValue();
-
- /**
- * The meta object literal for the '<em><b>Parameter</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference PARAMETER_VALUE__PARAMETER = eINSTANCE.getParameterValue_Parameter();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute PARAMETER_VALUE__VALUE = eINSTANCE.getParameterValue_Value();
-
- /**
- * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl <em>Documented Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDocumentedElement()
- * @generated
- */
- EClass DOCUMENTED_ELEMENT = eINSTANCE.getDocumentedElement();
-
- /**
- * The meta object literal for the '<em><b>Documentation</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute DOCUMENTED_ELEMENT__DOCUMENTATION = eINSTANCE.getDocumentedElement_Documentation();
-
- /**
- * The meta object literal for the '<em>Resource</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.ecore.resource.Resource
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getResource()
- * @generated
- */
- EDataType RESOURCE = eINSTANCE.getResource();
-
- }
-
-} // EFacetPackage
+/** + * Copyright (c) 2011, 2012 Mia-Software. + * + * 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: + * Gregoire Dupe (Mia-Software) - Design + * Nicolas Guyomar (Mia-Software) - Implementation + * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. + * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model + * Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet. + * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning + * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet + */ +package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EcorePackage; + +/** + * <!-- begin-user-doc --> + * The <b>Package</b> for the model. + * It contains accessors for the meta objects to represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory + * @model kind="package" + * annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='org.eclipse.ocl.ecore.OCL'" + * @generated + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. + */ +public interface EFacetPackage extends EPackage { + /** + * The package name. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + String eNAME = "efacet"; //$NON-NLS-1$ + + /** + * The package namespace URI. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"; //$NON-NLS-1$ + + /** + * The package namespace name. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + String eNS_PREFIX = "efacet"; //$NON-NLS-1$ + + /** + * The singleton instance of the package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EFacetPackage eINSTANCE = org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl.init(); + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl <em>Facet Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetAttribute() + * @generated + */ + int FACET_ATTRIBUTE = 0; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__EANNOTATIONS = EcorePackage.EATTRIBUTE__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__NAME = EcorePackage.EATTRIBUTE__NAME; + + /** + * The feature id for the '<em><b>Ordered</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__ORDERED = EcorePackage.EATTRIBUTE__ORDERED; + + /** + * The feature id for the '<em><b>Unique</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__UNIQUE = EcorePackage.EATTRIBUTE__UNIQUE; + + /** + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__LOWER_BOUND = EcorePackage.EATTRIBUTE__LOWER_BOUND; + + /** + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__UPPER_BOUND = EcorePackage.EATTRIBUTE__UPPER_BOUND; + + /** + * The feature id for the '<em><b>Many</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__MANY = EcorePackage.EATTRIBUTE__MANY; + + /** + * The feature id for the '<em><b>Required</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__REQUIRED = EcorePackage.EATTRIBUTE__REQUIRED; + + /** + * The feature id for the '<em><b>EType</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__ETYPE = EcorePackage.EATTRIBUTE__ETYPE; + + /** + * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__EGENERIC_TYPE = EcorePackage.EATTRIBUTE__EGENERIC_TYPE; + + /** + * The feature id for the '<em><b>Changeable</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__CHANGEABLE = EcorePackage.EATTRIBUTE__CHANGEABLE; + + /** + * The feature id for the '<em><b>Volatile</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__VOLATILE = EcorePackage.EATTRIBUTE__VOLATILE; + + /** + * The feature id for the '<em><b>Transient</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__TRANSIENT = EcorePackage.EATTRIBUTE__TRANSIENT; + + /** + * The feature id for the '<em><b>Default Value Literal</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__DEFAULT_VALUE_LITERAL = EcorePackage.EATTRIBUTE__DEFAULT_VALUE_LITERAL; + + /** + * The feature id for the '<em><b>Default Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__DEFAULT_VALUE = EcorePackage.EATTRIBUTE__DEFAULT_VALUE; + + /** + * The feature id for the '<em><b>Unsettable</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__UNSETTABLE = EcorePackage.EATTRIBUTE__UNSETTABLE; + + /** + * The feature id for the '<em><b>Derived</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__DERIVED = EcorePackage.EATTRIBUTE__DERIVED; + + /** + * The feature id for the '<em><b>EContaining Class</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__ECONTAINING_CLASS = EcorePackage.EATTRIBUTE__ECONTAINING_CLASS; + + /** + * The feature id for the '<em><b>ID</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__ID = EcorePackage.EATTRIBUTE__ID; + + /** + * The feature id for the '<em><b>EAttribute Type</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__EATTRIBUTE_TYPE = EcorePackage.EATTRIBUTE__EATTRIBUTE_TYPE; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__DOCUMENTATION = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Categories</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__CATEGORIES = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Query</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__QUERY = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Override</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE__OVERRIDE = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 3; + + /** + * The number of structural features of the '<em>Facet Attribute</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ATTRIBUTE_FEATURE_COUNT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 4; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl <em>Facet Reference</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetReference() + * @generated + */ + int FACET_REFERENCE = 1; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__EANNOTATIONS = EcorePackage.EREFERENCE__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__NAME = EcorePackage.EREFERENCE__NAME; + + /** + * The feature id for the '<em><b>Ordered</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__ORDERED = EcorePackage.EREFERENCE__ORDERED; + + /** + * The feature id for the '<em><b>Unique</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__UNIQUE = EcorePackage.EREFERENCE__UNIQUE; + + /** + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__LOWER_BOUND = EcorePackage.EREFERENCE__LOWER_BOUND; + + /** + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__UPPER_BOUND = EcorePackage.EREFERENCE__UPPER_BOUND; + + /** + * The feature id for the '<em><b>Many</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__MANY = EcorePackage.EREFERENCE__MANY; + + /** + * The feature id for the '<em><b>Required</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__REQUIRED = EcorePackage.EREFERENCE__REQUIRED; + + /** + * The feature id for the '<em><b>EType</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__ETYPE = EcorePackage.EREFERENCE__ETYPE; + + /** + * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__EGENERIC_TYPE = EcorePackage.EREFERENCE__EGENERIC_TYPE; + + /** + * The feature id for the '<em><b>Changeable</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__CHANGEABLE = EcorePackage.EREFERENCE__CHANGEABLE; + + /** + * The feature id for the '<em><b>Volatile</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__VOLATILE = EcorePackage.EREFERENCE__VOLATILE; + + /** + * The feature id for the '<em><b>Transient</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__TRANSIENT = EcorePackage.EREFERENCE__TRANSIENT; + + /** + * The feature id for the '<em><b>Default Value Literal</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__DEFAULT_VALUE_LITERAL = EcorePackage.EREFERENCE__DEFAULT_VALUE_LITERAL; + + /** + * The feature id for the '<em><b>Default Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__DEFAULT_VALUE = EcorePackage.EREFERENCE__DEFAULT_VALUE; + + /** + * The feature id for the '<em><b>Unsettable</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__UNSETTABLE = EcorePackage.EREFERENCE__UNSETTABLE; + + /** + * The feature id for the '<em><b>Derived</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__DERIVED = EcorePackage.EREFERENCE__DERIVED; + + /** + * The feature id for the '<em><b>EContaining Class</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__ECONTAINING_CLASS = EcorePackage.EREFERENCE__ECONTAINING_CLASS; + + /** + * The feature id for the '<em><b>Containment</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__CONTAINMENT = EcorePackage.EREFERENCE__CONTAINMENT; + + /** + * The feature id for the '<em><b>Container</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__CONTAINER = EcorePackage.EREFERENCE__CONTAINER; + + /** + * The feature id for the '<em><b>Resolve Proxies</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__RESOLVE_PROXIES = EcorePackage.EREFERENCE__RESOLVE_PROXIES; + + /** + * The feature id for the '<em><b>EOpposite</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__EOPPOSITE = EcorePackage.EREFERENCE__EOPPOSITE; + + /** + * The feature id for the '<em><b>EReference Type</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__EREFERENCE_TYPE = EcorePackage.EREFERENCE__EREFERENCE_TYPE; + + /** + * The feature id for the '<em><b>EKeys</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__EKEYS = EcorePackage.EREFERENCE__EKEYS; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__DOCUMENTATION = EcorePackage.EREFERENCE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Categories</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__CATEGORIES = EcorePackage.EREFERENCE_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Query</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__QUERY = EcorePackage.EREFERENCE_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Override</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE__OVERRIDE = EcorePackage.EREFERENCE_FEATURE_COUNT + 3; + + /** + * The number of structural features of the '<em>Facet Reference</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_REFERENCE_FEATURE_COUNT = EcorePackage.EREFERENCE_FEATURE_COUNT + 4; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl <em>Facet Operation</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetOperation() + * @generated + */ + int FACET_OPERATION = 2; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__NAME = EcorePackage.EOPERATION__NAME; + + /** + * The feature id for the '<em><b>Ordered</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__ORDERED = EcorePackage.EOPERATION__ORDERED; + + /** + * The feature id for the '<em><b>Unique</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__UNIQUE = EcorePackage.EOPERATION__UNIQUE; + + /** + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND; + + /** + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND; + + /** + * The feature id for the '<em><b>Many</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__MANY = EcorePackage.EOPERATION__MANY; + + /** + * The feature id for the '<em><b>Required</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__REQUIRED = EcorePackage.EOPERATION__REQUIRED; + + /** + * The feature id for the '<em><b>EType</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__ETYPE = EcorePackage.EOPERATION__ETYPE; + + /** + * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__EGENERIC_TYPE = EcorePackage.EOPERATION__EGENERIC_TYPE; + + /** + * The feature id for the '<em><b>EContaining Class</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__ECONTAINING_CLASS = EcorePackage.EOPERATION__ECONTAINING_CLASS; + + /** + * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__ETYPE_PARAMETERS = EcorePackage.EOPERATION__ETYPE_PARAMETERS; + + /** + * The feature id for the '<em><b>EParameters</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__EPARAMETERS = EcorePackage.EOPERATION__EPARAMETERS; + + /** + * The feature id for the '<em><b>EExceptions</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS; + + /** + * The feature id for the '<em><b>EGeneric Exceptions</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__EGENERIC_EXCEPTIONS = EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__DOCUMENTATION = EcorePackage.EOPERATION_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Categories</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__CATEGORIES = EcorePackage.EOPERATION_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Query</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__QUERY = EcorePackage.EOPERATION_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Override</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION__OVERRIDE = EcorePackage.EOPERATION_FEATURE_COUNT + 3; + + /** + * The number of structural features of the '<em>Facet Operation</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_OPERATION_FEATURE_COUNT = EcorePackage.EOPERATION_FEATURE_COUNT + 4; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl <em>Facet Set</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetSet() + * @generated + */ + int FACET_SET = 3; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__EANNOTATIONS = EcorePackage.EPACKAGE__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__NAME = EcorePackage.EPACKAGE__NAME; + + /** + * The feature id for the '<em><b>Ns URI</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__NS_URI = EcorePackage.EPACKAGE__NS_URI; + + /** + * The feature id for the '<em><b>Ns Prefix</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__NS_PREFIX = EcorePackage.EPACKAGE__NS_PREFIX; + + /** + * The feature id for the '<em><b>EFactory Instance</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__EFACTORY_INSTANCE = EcorePackage.EPACKAGE__EFACTORY_INSTANCE; + + /** + * The feature id for the '<em><b>EClassifiers</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__ECLASSIFIERS = EcorePackage.EPACKAGE__ECLASSIFIERS; + + /** + * The feature id for the '<em><b>ESubpackages</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__ESUBPACKAGES = EcorePackage.EPACKAGE__ESUBPACKAGES; + + /** + * The feature id for the '<em><b>ESuper Package</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__ESUPER_PACKAGE = EcorePackage.EPACKAGE__ESUPER_PACKAGE; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__DOCUMENTATION = EcorePackage.EPACKAGE_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Categories</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET__CATEGORIES = EcorePackage.EPACKAGE_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>Facet Set</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_SET_FEATURE_COUNT = EcorePackage.EPACKAGE_FEATURE_COUNT + 2; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl <em>Facet</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacet() + * @generated + */ + int FACET = 4; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__EANNOTATIONS = EcorePackage.ECLASSIFIER__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__NAME = EcorePackage.ECLASSIFIER__NAME; + + /** + * The feature id for the '<em><b>Instance Class Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__INSTANCE_CLASS_NAME = EcorePackage.ECLASSIFIER__INSTANCE_CLASS_NAME; + + /** + * The feature id for the '<em><b>Instance Class</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__INSTANCE_CLASS = EcorePackage.ECLASSIFIER__INSTANCE_CLASS; + + /** + * The feature id for the '<em><b>Default Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__DEFAULT_VALUE = EcorePackage.ECLASSIFIER__DEFAULT_VALUE; + + /** + * The feature id for the '<em><b>Instance Type Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__INSTANCE_TYPE_NAME = EcorePackage.ECLASSIFIER__INSTANCE_TYPE_NAME; + + /** + * The feature id for the '<em><b>EPackage</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__EPACKAGE = EcorePackage.ECLASSIFIER__EPACKAGE; + + /** + * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__ETYPE_PARAMETERS = EcorePackage.ECLASSIFIER__ETYPE_PARAMETERS; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__DOCUMENTATION = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Extended Metaclass</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__EXTENDED_METACLASS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Facet Elements</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__FACET_ELEMENTS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Facet Operations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__FACET_OPERATIONS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 3; + + /** + * The feature id for the '<em><b>Conformance Typed Element</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__CONFORMANCE_TYPED_ELEMENT = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 4; + + /** + * The feature id for the '<em><b>Extended Facets</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET__EXTENDED_FACETS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 5; + + /** + * The feature id for the '<em><b>All Typed Elements</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + * @since 1.2 + */ + int FACET__ALL_TYPED_ELEMENTS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 6; + + /** + * The feature id for the '<em><b>All Facet Operations</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + * @since 1.2 + */ + int FACET__ALL_FACET_OPERATIONS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 7; + + /** + * The feature id for the '<em><b>All Facet Elements</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + * @since 1.2 + */ + int FACET__ALL_FACET_ELEMENTS = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 8; + + /** + * The number of structural features of the '<em>Facet</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + * @noreference This field is not intended to be referenced by clients. + */ + int FACET_FEATURE_COUNT = EcorePackage.ECLASSIFIER_FEATURE_COUNT + 9; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl <em>Category</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getCategory() + * @generated + */ + int CATEGORY = 5; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CATEGORY__EANNOTATIONS = EcorePackage.ENAMED_ELEMENT__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CATEGORY__NAME = EcorePackage.ENAMED_ELEMENT__NAME; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CATEGORY__DOCUMENTATION = EcorePackage.ENAMED_ELEMENT_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Category</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int CATEGORY_FEATURE_COUNT = EcorePackage.ENAMED_ELEMENT_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl <em>Facet Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetElement() + * @generated + */ + int FACET_ELEMENT = 6; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__EANNOTATIONS = EcorePackage.ETYPED_ELEMENT__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__NAME = EcorePackage.ETYPED_ELEMENT__NAME; + + /** + * The feature id for the '<em><b>Ordered</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__ORDERED = EcorePackage.ETYPED_ELEMENT__ORDERED; + + /** + * The feature id for the '<em><b>Unique</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__UNIQUE = EcorePackage.ETYPED_ELEMENT__UNIQUE; + + /** + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__LOWER_BOUND = EcorePackage.ETYPED_ELEMENT__LOWER_BOUND; + + /** + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__UPPER_BOUND = EcorePackage.ETYPED_ELEMENT__UPPER_BOUND; + + /** + * The feature id for the '<em><b>Many</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__MANY = EcorePackage.ETYPED_ELEMENT__MANY; + + /** + * The feature id for the '<em><b>Required</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__REQUIRED = EcorePackage.ETYPED_ELEMENT__REQUIRED; + + /** + * The feature id for the '<em><b>EType</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__ETYPE = EcorePackage.ETYPED_ELEMENT__ETYPE; + + /** + * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__EGENERIC_TYPE = EcorePackage.ETYPED_ELEMENT__EGENERIC_TYPE; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__DOCUMENTATION = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Categories</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT__CATEGORIES = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>Facet Element</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int FACET_ELEMENT_FEATURE_COUNT = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 2; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl <em>Derived Typed Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDerivedTypedElement() + * @generated + */ + int DERIVED_TYPED_ELEMENT = 7; + + /** + * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__EANNOTATIONS = FACET_ELEMENT__EANNOTATIONS; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__NAME = FACET_ELEMENT__NAME; + + /** + * The feature id for the '<em><b>Ordered</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__ORDERED = FACET_ELEMENT__ORDERED; + + /** + * The feature id for the '<em><b>Unique</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__UNIQUE = FACET_ELEMENT__UNIQUE; + + /** + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__LOWER_BOUND = FACET_ELEMENT__LOWER_BOUND; + + /** + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__UPPER_BOUND = FACET_ELEMENT__UPPER_BOUND; + + /** + * The feature id for the '<em><b>Many</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__MANY = FACET_ELEMENT__MANY; + + /** + * The feature id for the '<em><b>Required</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__REQUIRED = FACET_ELEMENT__REQUIRED; + + /** + * The feature id for the '<em><b>EType</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__ETYPE = FACET_ELEMENT__ETYPE; + + /** + * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__EGENERIC_TYPE = FACET_ELEMENT__EGENERIC_TYPE; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__DOCUMENTATION = FACET_ELEMENT__DOCUMENTATION; + + /** + * The feature id for the '<em><b>Categories</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__CATEGORIES = FACET_ELEMENT__CATEGORIES; + + /** + * The feature id for the '<em><b>Query</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__QUERY = FACET_ELEMENT_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Override</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT__OVERRIDE = FACET_ELEMENT_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>Derived Typed Element</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DERIVED_TYPED_ELEMENT_FEATURE_COUNT = FACET_ELEMENT_FEATURE_COUNT + 2; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl <em>Parameter Value</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getParameterValue() + * @generated + */ + int PARAMETER_VALUE = 8; + + /** + * The feature id for the '<em><b>Parameter</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PARAMETER_VALUE__PARAMETER = 0; + + /** + * The feature id for the '<em><b>Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PARAMETER_VALUE__VALUE = 1; + + /** + * The number of structural features of the '<em>Parameter Value</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int PARAMETER_VALUE_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl <em>Documented Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDocumentedElement() + * @generated + */ + int DOCUMENTED_ELEMENT = 9; + + /** + * The feature id for the '<em><b>Documentation</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DOCUMENTED_ELEMENT__DOCUMENTATION = 0; + + /** + * The number of structural features of the '<em>Documented Element</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int DOCUMENTED_ELEMENT_FEATURE_COUNT = 1; + + /** + * The meta object id for the '<em>Resource</em>' data type. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.emf.ecore.resource.Resource + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getResource() + * @generated + */ + int RESOURCE = 10; + + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute <em>Facet Attribute</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Facet Attribute</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute + * @generated + */ + EClass getFacetAttribute(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference <em>Facet Reference</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Facet Reference</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference + * @generated + */ + EClass getFacetReference(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation <em>Facet Operation</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Facet Operation</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation + * @generated + */ + EClass getFacetOperation(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet <em>Facet Set</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Facet Set</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet + * @generated + */ + EClass getFacetSet(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet#getCategories <em>Categories</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the containment reference list '<em>Categories</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet#getCategories() + * @see #getFacetSet() + * @generated + */ + EReference getFacetSet_Categories(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet <em>Facet</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Facet</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet + * @generated + */ + EClass getFacet(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass <em>Extended Metaclass</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference '<em>Extended Metaclass</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass() + * @see #getFacet() + * @generated + */ + EReference getFacet_ExtendedMetaclass(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetElements <em>Facet Elements</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the containment reference list '<em>Facet Elements</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetElements() + * @see #getFacet() + * @generated + */ + EReference getFacet_FacetElements(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetOperations <em>Facet Operations</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the containment reference list '<em>Facet Operations</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetOperations() + * @see #getFacet() + * @generated + */ + EReference getFacet_FacetOperations(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement <em>Conformance Typed Element</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference '<em>Conformance Typed Element</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement() + * @see #getFacet() + * @generated + */ + EReference getFacet_ConformanceTypedElement(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedFacets <em>Extended Facets</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference list '<em>Extended Facets</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedFacets() + * @see #getFacet() + * @generated + */ + EReference getFacet_ExtendedFacets(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllTypedElements <em>All Typed Elements</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference list '<em>All Typed Elements</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllTypedElements() + * @see #getFacet() + * @generated + * @since 1.2 + */ + EReference getFacet_AllTypedElements(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetOperations <em>All Facet Operations</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference list '<em>All Facet Operations</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetOperations() + * @see #getFacet() + * @generated + * @since 1.2 + */ + EReference getFacet_AllFacetOperations(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetElements <em>All Facet Elements</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference list '<em>All Facet Elements</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetElements() + * @see #getFacet() + * @generated + * @since 1.2 + */ + EReference getFacet_AllFacetElements(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Category <em>Category</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Category</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Category + * @generated + */ + EClass getCategory(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement <em>Facet Element</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Facet Element</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement + * @generated + */ + EClass getFacetElement(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement#getCategories <em>Categories</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference list '<em>Categories</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement#getCategories() + * @see #getFacetElement() + * @generated + */ + EReference getFacetElement_Categories(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement <em>Derived Typed Element</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Derived Typed Element</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement + * @generated + */ + EClass getDerivedTypedElement(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getQuery <em>Query</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the containment reference '<em>Query</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getQuery() + * @see #getDerivedTypedElement() + * @generated + */ + EReference getDerivedTypedElement_Query(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getOverride <em>Override</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference '<em>Override</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement#getOverride() + * @see #getDerivedTypedElement() + * @generated + */ + EReference getDerivedTypedElement_Override(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue <em>Parameter Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Parameter Value</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue + * @generated + */ + EClass getParameterValue(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getParameter <em>Parameter</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the reference '<em>Parameter</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getParameter() + * @see #getParameterValue() + * @generated + */ + EReference getParameterValue_Parameter(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getValue <em>Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Value</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue#getValue() + * @see #getParameterValue() + * @generated + */ + EAttribute getParameterValue_Value(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement <em>Documented Element</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Documented Element</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement + * @generated + */ + EClass getDocumentedElement(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement#getDocumentation <em>Documentation</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Documentation</em>'. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement#getDocumentation() + * @see #getDocumentedElement() + * @generated + */ + EAttribute getDocumentedElement_Documentation(); + + /** + * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource <em>Resource</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for data type '<em>Resource</em>'. + * @see org.eclipse.emf.ecore.resource.Resource + * @model instanceClass="org.eclipse.emf.ecore.resource.Resource" + * @generated + */ + EDataType getResource(); + + /** + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the factory that creates the instances of the model. + * @generated + */ + EFacetFactory getEFacetFactory(); + + /** + * <!-- begin-user-doc --> + * Defines literals for the meta objects that represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + * <!-- end-user-doc --> + * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl <em>Facet Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetAttributeImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetAttribute() + * @generated + */ + EClass FACET_ATTRIBUTE = eINSTANCE.getFacetAttribute(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl <em>Facet Reference</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetReferenceImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetReference() + * @generated + */ + EClass FACET_REFERENCE = eINSTANCE.getFacetReference(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl <em>Facet Operation</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetOperationImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetOperation() + * @generated + */ + EClass FACET_OPERATION = eINSTANCE.getFacetOperation(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl <em>Facet Set</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetSet() + * @generated + */ + EClass FACET_SET = eINSTANCE.getFacetSet(); + + /** + * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET_SET__CATEGORIES = eINSTANCE.getFacetSet_Categories(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl <em>Facet</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacet() + * @generated + */ + EClass FACET = eINSTANCE.getFacet(); + + /** + * The meta object literal for the '<em><b>Extended Metaclass</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET__EXTENDED_METACLASS = eINSTANCE.getFacet_ExtendedMetaclass(); + + /** + * The meta object literal for the '<em><b>Facet Elements</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET__FACET_ELEMENTS = eINSTANCE.getFacet_FacetElements(); + + /** + * The meta object literal for the '<em><b>Facet Operations</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET__FACET_OPERATIONS = eINSTANCE.getFacet_FacetOperations(); + + /** + * The meta object literal for the '<em><b>Conformance Typed Element</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET__CONFORMANCE_TYPED_ELEMENT = eINSTANCE.getFacet_ConformanceTypedElement(); + + /** + * The meta object literal for the '<em><b>Extended Facets</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET__EXTENDED_FACETS = eINSTANCE.getFacet_ExtendedFacets(); + + /** + * The meta object literal for the '<em><b>All Typed Elements</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + EReference FACET__ALL_TYPED_ELEMENTS = eINSTANCE.getFacet_AllTypedElements(); + + /** + * The meta object literal for the '<em><b>All Facet Operations</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + EReference FACET__ALL_FACET_OPERATIONS = eINSTANCE.getFacet_AllFacetOperations(); + + /** + * The meta object literal for the '<em><b>All Facet Elements</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + EReference FACET__ALL_FACET_ELEMENTS = eINSTANCE.getFacet_AllFacetElements(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl <em>Category</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.CategoryImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getCategory() + * @generated + */ + EClass CATEGORY = eINSTANCE.getCategory(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl <em>Facet Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetElementImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getFacetElement() + * @generated + */ + EClass FACET_ELEMENT = eINSTANCE.getFacetElement(); + + /** + * The meta object literal for the '<em><b>Categories</b></em>' reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference FACET_ELEMENT__CATEGORIES = eINSTANCE.getFacetElement_Categories(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl <em>Derived Typed Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DerivedTypedElementImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDerivedTypedElement() + * @generated + */ + EClass DERIVED_TYPED_ELEMENT = eINSTANCE.getDerivedTypedElement(); + + /** + * The meta object literal for the '<em><b>Query</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference DERIVED_TYPED_ELEMENT__QUERY = eINSTANCE.getDerivedTypedElement_Query(); + + /** + * The meta object literal for the '<em><b>Override</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference DERIVED_TYPED_ELEMENT__OVERRIDE = eINSTANCE.getDerivedTypedElement_Override(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl <em>Parameter Value</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.ParameterValueImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getParameterValue() + * @generated + */ + EClass PARAMETER_VALUE = eINSTANCE.getParameterValue(); + + /** + * The meta object literal for the '<em><b>Parameter</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EReference PARAMETER_VALUE__PARAMETER = eINSTANCE.getParameterValue_Parameter(); + + /** + * The meta object literal for the '<em><b>Value</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EAttribute PARAMETER_VALUE__VALUE = eINSTANCE.getParameterValue_Value(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl <em>Documented Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.DocumentedElementImpl + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getDocumentedElement() + * @generated + */ + EClass DOCUMENTED_ELEMENT = eINSTANCE.getDocumentedElement(); + + /** + * The meta object literal for the '<em><b>Documentation</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + EAttribute DOCUMENTED_ELEMENT__DOCUMENTATION = eINSTANCE.getDocumentedElement_Documentation(); + + /** + * The meta object literal for the '<em>Resource</em>' data type. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.emf.ecore.resource.Resource + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.EFacetPackageImpl#getResource() + * @generated + */ + EDataType RESOURCE = eINSTANCE.getResource(); + + } + +} // EFacetPackage diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java index c4137264243..81a57ee7cce 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java @@ -1,211 +1,215 @@ -/**
- * Copyright (c) 2011 Mia-Software.
- *
- * 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:
- * Gregoire Dupe (Mia-Software) - Design
- * Nicolas Guyomar (Mia-Software) - Implementation
- * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.
- * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model
- * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
- * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
- * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet
- */
-package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facet</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A Facet is a virtual sub-type of an existing EClass. A Facet cannot be instantiated.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass <em>Extended Metaclass</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetElements <em>Facet Elements</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetOperations <em>Facet Operations</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement <em>Conformance Typed Element</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedFacets <em>Extended Facets</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllTypedElements <em>All Typed Elements</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetOperations <em>All Facet Operations</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetElements <em>All Facet Elements</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='( self.query.scope = self.facet.extendedMetaClass ) and ( self.query.name = self.name )'"
- * annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='self.conformanceQuery.scope = self.extendedMetaClass'"
- * annotation="org.eclipse.ocl.ecore.OCL body='not(self.container().oclCastAs(FacetSet).facets->exists(f|f.extendedMetaClass.container() <> self.extendedMetaClass.container() ))'"
- * @generated
- */
-public interface Facet extends EClassifier, DocumentedElement {
- /**
- * Returns the value of the '<em><b>Extended Metaclass</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Extended Metaclass</em>' reference isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Extended Metaclass</em>' reference.
- * @see #setExtendedMetaclass(EClass)
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_ExtendedMetaclass()
- * @model annotation="GenModel documentation='The \"extendedMetaclass\" reference references the virtually subtyped EClass.'"
- * @generated
- */
- EClass getExtendedMetaclass();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass <em>Extended Metaclass</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Extended Metaclass</em>' reference.
- * @see #getExtendedMetaclass()
- * @generated
- */
- void setExtendedMetaclass(EClass value);
-
- /**
- * Returns the value of the '<em><b>Facet Elements</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.ecore.EStructuralFeature}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This composite reference contains virtual attributes, references and operations.
- * <!-- end-model-doc -->
- *
- * @return the value of the '<em>Facet Elements</em>' containment reference list.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_FacetElements()
- * @model containment="true"
- * @generated
- */
- EList<EStructuralFeature> getFacetElements();
-
- /**
- * Returns the value of the '<em><b>Facet Operations</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Facet Operations</em>' containment reference list isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Facet Operations</em>' containment reference list.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_FacetOperations()
- * @model containment="true"
- * @generated
- */
- EList<FacetOperation> getFacetOperations();
-
- /**
- * Returns the value of the '<em><b>Conformance Typed Element</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Conformance Typed Element</em>' reference isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Conformance Typed Element</em>' reference.
- * @see #setConformanceTypedElement(ETypedElement)
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_ConformanceTypedElement()
- * @model
- * @generated
- */
- ETypedElement getConformanceTypedElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement <em>Conformance Typed Element</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Conformance Typed Element</em>' reference.
- * @see #getConformanceTypedElement()
- * @generated
- */
- void setConformanceTypedElement(ETypedElement value);
-
- /**
- * Returns the value of the '<em><b>Extended Facets</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Extended Facets</em>' reference list isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Extended Facets</em>' reference list.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_ExtendedFacets()
- * @model annotation="GenModel documentation='A facet can extend other facets. If A facet A can extend a facet B. In this case an eObject conforms to the facet A if it matches conformance evaluation of A and B. '"
- * @generated
- */
- EList<Facet> getExtendedFacets();
-
- /**
- * Returns the value of the '<em><b>All Typed Elements</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.ecore.ETypedElement}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>All Typed Elements</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>All Typed Elements</em>' reference list.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_AllTypedElements()
- * @model changeable="false" derived="true"
- * @generated
- */
- EList<ETypedElement> getAllTypedElements();
-
- /**
- * Returns the value of the '<em><b>All Facet Operations</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>All Facet Operations</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>All Facet Operations</em>' reference list.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_AllFacetOperations()
- * @model changeable="false" derived="true"
- * @generated
- */
- EList<FacetOperation> getAllFacetOperations();
-
- /**
- * Returns the value of the '<em><b>All Facet Elements</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.ecore.EStructuralFeature}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>All Facet Elements</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>All Facet Elements</em>' reference list.
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_AllFacetElements()
- * @model changeable="false" derived="true"
- * @generated
- */
- EList<EStructuralFeature> getAllFacetElements();
-
-} // Facet
+/** + * Copyright (c) 2011 Mia-Software. + * + * 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: + * Gregoire Dupe (Mia-Software) - Design + * Nicolas Guyomar (Mia-Software) - Implementation + * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. + * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model + * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework + * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning + * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet + */ +package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.ETypedElement; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Facet</b></em>'. + * <!-- end-user-doc --> + * + * <!-- begin-model-doc --> + * A Facet is a virtual sub-type of an existing EClass. A Facet cannot be instantiated. + * <!-- end-model-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass <em>Extended Metaclass</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetElements <em>Facet Elements</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getFacetOperations <em>Facet Operations</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement <em>Conformance Typed Element</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedFacets <em>Extended Facets</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllTypedElements <em>All Typed Elements</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetOperations <em>All Facet Operations</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getAllFacetElements <em>All Facet Elements</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet() + * @model annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='( self.query.scope = self.facet.extendedMetaClass ) and ( self.query.name = self.name )'" + * annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='self.conformanceQuery.scope = self.extendedMetaClass'" + * annotation="org.eclipse.ocl.ecore.OCL body='not(self.container().oclCastAs(FacetSet).facets->exists(f|f.extendedMetaClass.container() <> self.extendedMetaClass.container() ))'" + * @generated + * @noimplement This interface is not intended to be implemented by clients. + */ +public interface Facet extends EClassifier, DocumentedElement { + /** + * Returns the value of the '<em><b>Extended Metaclass</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Extended Metaclass</em>' reference isn't clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Extended Metaclass</em>' reference. + * @see #setExtendedMetaclass(EClass) + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_ExtendedMetaclass() + * @model annotation="GenModel documentation='The \"extendedMetaclass\" reference references the virtually subtyped EClass.'" + * @generated + */ + EClass getExtendedMetaclass(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getExtendedMetaclass <em>Extended Metaclass</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Extended Metaclass</em>' reference. + * @see #getExtendedMetaclass() + * @generated + */ + void setExtendedMetaclass(EClass value); + + /** + * Returns the value of the '<em><b>Facet Elements</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.EStructuralFeature}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * This composite reference contains virtual attributes, references and operations. + * <!-- end-model-doc --> + * + * @return the value of the '<em>Facet Elements</em>' containment reference list. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_FacetElements() + * @model containment="true" + * @generated + */ + EList<EStructuralFeature> getFacetElements(); + + /** + * Returns the value of the '<em><b>Facet Operations</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Facet Operations</em>' containment reference list isn't clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Facet Operations</em>' containment reference list. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_FacetOperations() + * @model containment="true" + * @generated + */ + EList<FacetOperation> getFacetOperations(); + + /** + * Returns the value of the '<em><b>Conformance Typed Element</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Conformance Typed Element</em>' reference isn't clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Conformance Typed Element</em>' reference. + * @see #setConformanceTypedElement(ETypedElement) + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_ConformanceTypedElement() + * @model + * @generated + */ + ETypedElement getConformanceTypedElement(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet#getConformanceTypedElement <em>Conformance Typed Element</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Conformance Typed Element</em>' reference. + * @see #getConformanceTypedElement() + * @generated + */ + void setConformanceTypedElement(ETypedElement value); + + /** + * Returns the value of the '<em><b>Extended Facets</b></em>' reference list. + * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Extended Facets</em>' reference list isn't clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Extended Facets</em>' reference list. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_ExtendedFacets() + * @model annotation="GenModel documentation='A facet can extend other facets. If A facet A can extend a facet B. In this case an eObject conforms to the facet A if it matches conformance evaluation of A and B. '" + * @generated + */ + EList<Facet> getExtendedFacets(); + + /** + * Returns the value of the '<em><b>All Typed Elements</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.ETypedElement}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>All Typed Elements</em>' reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>All Typed Elements</em>' reference list. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_AllTypedElements() + * @model changeable="false" derived="true" + * @generated + * @since 1.2 + */ + EList<ETypedElement> getAllTypedElements(); + + /** + * Returns the value of the '<em><b>All Facet Operations</b></em>' reference list. + * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>All Facet Operations</em>' reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>All Facet Operations</em>' reference list. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_AllFacetOperations() + * @model changeable="false" derived="true" + * @generated + * @since 1.2 + */ + EList<FacetOperation> getAllFacetOperations(); + + /** + * Returns the value of the '<em><b>All Facet Elements</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.EStructuralFeature}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>All Facet Elements</em>' reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>All Facet Elements</em>' reference list. + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#getFacet_AllFacetElements() + * @model changeable="false" derived="true" + * @generated + * @since 1.2 + */ + EList<EStructuralFeature> getAllFacetElements(); + +} // Facet diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java index f284fa574ac..8ebbc4ba5a3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java @@ -1,754 +1,759 @@ -/**
- * Copyright (c) 2011, 2012 Mia-Software.
- *
- * 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:
- * Gregoire Dupe (Mia-Software) - Design
- * Nicolas Guyomar (Mia-Software) - Implementation
- * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.
- * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model
- * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
- * Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.
- * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
- * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet
- */
-package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Category;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.ExtensiblePackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.ExtensiblePackageImpl;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.impl.QueryPackageImpl;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.RuntimePackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.impl.RuntimePackageImpl;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.SerializationPackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.impl.SerializationPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class EFacetPackageImpl extends EPackageImpl implements EFacetPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass facetAttributeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass facetReferenceEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass facetOperationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass facetSetEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass facetEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass categoryEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass facetElementEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass derivedTypedElementEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass parameterValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass documentedElementEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EDataType resourceEDataType = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>
- * Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private EFacetPackageImpl() {
- super(eNS_URI, EFacetFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
- * <p>
- * This method is used to initialize {@link EFacetPackage#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static EFacetPackage init() {
- if (isInited) {
- return (EFacetPackage) EPackage.Registry.INSTANCE.getEPackage(EFacetPackage.eNS_URI);
- }
-
- // Obtain or create and register package
- EFacetPackageImpl theEFacetPackage = (EFacetPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EFacetPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EFacetPackageImpl());
-
- isInited = true;
-
- // Obtain or create and register interdependencies
- SerializationPackageImpl theSerializationPackage = (SerializationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SerializationPackage.eNS_URI) instanceof SerializationPackageImpl
- ? EPackage.Registry.INSTANCE.getEPackage(SerializationPackage.eNS_URI) : SerializationPackage.eINSTANCE);
- ExtensiblePackageImpl theExtensiblePackage = (ExtensiblePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI) instanceof ExtensiblePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI)
- : ExtensiblePackage.eINSTANCE);
- QueryPackageImpl theQueryPackage = (QueryPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI) instanceof QueryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI) : QueryPackage.eINSTANCE);
- RuntimePackageImpl theRuntimePackage = (RuntimePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RuntimePackage.eNS_URI) instanceof RuntimePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RuntimePackage.eNS_URI) : RuntimePackage.eINSTANCE);
-
- // Create package meta-data objects
- theEFacetPackage.createPackageContents();
- theSerializationPackage.createPackageContents();
- theExtensiblePackage.createPackageContents();
- theQueryPackage.createPackageContents();
- theRuntimePackage.createPackageContents();
-
- // Initialize created meta-data
- theEFacetPackage.initializePackageContents();
- theSerializationPackage.initializePackageContents();
- theExtensiblePackage.initializePackageContents();
- theQueryPackage.initializePackageContents();
- theRuntimePackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theEFacetPackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(EFacetPackage.eNS_URI, theEFacetPackage);
- return theEFacetPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFacetAttribute() {
- return facetAttributeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFacetReference() {
- return facetReferenceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFacetOperation() {
- return facetOperationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFacetSet() {
- return facetSetEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacetSet_Categories() {
- return (EReference) facetSetEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFacet() {
- return facetEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_ExtendedMetaclass() {
- return (EReference) facetEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_FacetElements() {
- return (EReference) facetEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_FacetOperations() {
- return (EReference) facetEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_ConformanceTypedElement() {
- return (EReference) facetEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_ExtendedFacets() {
- return (EReference) facetEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_AllTypedElements() {
- return (EReference) facetEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_AllFacetOperations() {
- return (EReference) facetEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacet_AllFacetElements() {
- return (EReference) facetEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getCategory() {
- return categoryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getFacetElement() {
- return facetElementEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getFacetElement_Categories() {
- return (EReference) facetElementEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getDerivedTypedElement() {
- return derivedTypedElementEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getDerivedTypedElement_Query() {
- return (EReference) derivedTypedElementEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getDerivedTypedElement_Override() {
- return (EReference) derivedTypedElementEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getParameterValue() {
- return parameterValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getParameterValue_Parameter() {
- return (EReference) parameterValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getParameterValue_Value() {
- return (EAttribute) parameterValueEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getDocumentedElement() {
- return documentedElementEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getDocumentedElement_Documentation() {
- return (EAttribute) documentedElementEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EDataType getResource() {
- return resourceEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EFacetFactory getEFacetFactory() {
- return (EFacetFactory) getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) {
- return;
- }
- isCreated = true;
-
- // Create classes and their features
- facetAttributeEClass = createEClass(FACET_ATTRIBUTE);
-
- facetReferenceEClass = createEClass(FACET_REFERENCE);
-
- facetOperationEClass = createEClass(FACET_OPERATION);
-
- facetSetEClass = createEClass(FACET_SET);
- createEReference(facetSetEClass, FACET_SET__CATEGORIES);
-
- facetEClass = createEClass(FACET);
- createEReference(facetEClass, FACET__EXTENDED_METACLASS);
- createEReference(facetEClass, FACET__FACET_ELEMENTS);
- createEReference(facetEClass, FACET__FACET_OPERATIONS);
- createEReference(facetEClass, FACET__CONFORMANCE_TYPED_ELEMENT);
- createEReference(facetEClass, FACET__EXTENDED_FACETS);
- createEReference(facetEClass, FACET__ALL_TYPED_ELEMENTS);
- createEReference(facetEClass, FACET__ALL_FACET_OPERATIONS);
- createEReference(facetEClass, FACET__ALL_FACET_ELEMENTS);
-
- categoryEClass = createEClass(CATEGORY);
-
- facetElementEClass = createEClass(FACET_ELEMENT);
- createEReference(facetElementEClass, FACET_ELEMENT__CATEGORIES);
-
- derivedTypedElementEClass = createEClass(DERIVED_TYPED_ELEMENT);
- createEReference(derivedTypedElementEClass, DERIVED_TYPED_ELEMENT__QUERY);
- createEReference(derivedTypedElementEClass, DERIVED_TYPED_ELEMENT__OVERRIDE);
-
- parameterValueEClass = createEClass(PARAMETER_VALUE);
- createEReference(parameterValueEClass, PARAMETER_VALUE__PARAMETER);
- createEAttribute(parameterValueEClass, PARAMETER_VALUE__VALUE);
-
- documentedElementEClass = createEClass(DOCUMENTED_ELEMENT);
- createEAttribute(documentedElementEClass, DOCUMENTED_ELEMENT__DOCUMENTATION);
-
- // Create data types
- resourceEDataType = createEDataType(RESOURCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) {
- return;
- }
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- SerializationPackage theSerializationPackage = (SerializationPackage) EPackage.Registry.INSTANCE.getEPackage(SerializationPackage.eNS_URI);
- ExtensiblePackage theExtensiblePackage = (ExtensiblePackage) EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI);
- QueryPackage theQueryPackage = (QueryPackage) EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI);
- RuntimePackage theRuntimePackage = (RuntimePackage) EPackage.Registry.INSTANCE.getEPackage(RuntimePackage.eNS_URI);
-
- // Add subpackages
- getESubpackages().add(theSerializationPackage);
- getESubpackages().add(theExtensiblePackage);
- getESubpackages().add(theQueryPackage);
- getESubpackages().add(theRuntimePackage);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- facetAttributeEClass.getESuperTypes().add(ecorePackage.getEAttribute());
- facetAttributeEClass.getESuperTypes().add(this.getDerivedTypedElement());
- facetReferenceEClass.getESuperTypes().add(ecorePackage.getEReference());
- facetReferenceEClass.getESuperTypes().add(this.getDerivedTypedElement());
- facetOperationEClass.getESuperTypes().add(ecorePackage.getEOperation());
- facetOperationEClass.getESuperTypes().add(this.getDerivedTypedElement());
- facetSetEClass.getESuperTypes().add(ecorePackage.getEPackage());
- facetSetEClass.getESuperTypes().add(this.getDocumentedElement());
- facetEClass.getESuperTypes().add(ecorePackage.getEClassifier());
- facetEClass.getESuperTypes().add(this.getDocumentedElement());
- categoryEClass.getESuperTypes().add(ecorePackage.getENamedElement());
- categoryEClass.getESuperTypes().add(this.getDocumentedElement());
- facetElementEClass.getESuperTypes().add(ecorePackage.getETypedElement());
- facetElementEClass.getESuperTypes().add(this.getDocumentedElement());
- derivedTypedElementEClass.getESuperTypes().add(this.getFacetElement());
-
- // Initialize classes and features; add operations and parameters
- initEClass(facetAttributeEClass, FacetAttribute.class, "FacetAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(facetReferenceEClass, FacetReference.class, "FacetReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(facetOperationEClass, FacetOperation.class, "FacetOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(facetSetEClass, FacetSet.class, "FacetSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFacetSet_Categories(), this.getCategory(), null, "categories", null, 0, -1, FacetSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- addEOperation(facetSetEClass, this.getFacetSet(), "getFacetSets", 0, -1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(facetEClass, Facet.class, "Facet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFacet_ExtendedMetaclass(), ecorePackage.getEClass(), null, "extendedMetaclass", null, 0, 1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
- IS_ORDERED);
- initEReference(getFacet_FacetElements(), ecorePackage.getEStructuralFeature(), null, "facetElements", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
- IS_ORDERED);
- initEReference(getFacet_FacetOperations(), this.getFacetOperation(), null, "facetOperations", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFacet_ConformanceTypedElement(), ecorePackage.getETypedElement(), null, "conformanceTypedElement", null, 0, 1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$
- !IS_DERIVED, IS_ORDERED);
- initEReference(getFacet_ExtendedFacets(), this.getFacet(), null, "extendedFacets", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFacet_AllTypedElements(), ecorePackage.getETypedElement(), null, "allTypedElements", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$
- IS_ORDERED);
- initEReference(getFacet_AllFacetOperations(), this.getFacetOperation(), null, "allFacetOperations", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$
- IS_ORDERED);
- initEReference(getFacet_AllFacetElements(), ecorePackage.getEStructuralFeature(), null, "allFacetElements", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$
- IS_ORDERED);
-
- initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(facetElementEClass, FacetElement.class, "FacetElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFacetElement_Categories(), this.getCategory(), null, "categories", null, 0, -1, FacetElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(derivedTypedElementEClass, DerivedTypedElement.class, "DerivedTypedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getDerivedTypedElement_Query(), theExtensiblePackage.getQuery(), null, "query", null, 1, 1, DerivedTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
- IS_ORDERED);
- initEReference(getDerivedTypedElement_Override(), this.getDerivedTypedElement(), null, "override", null, 0, 1, DerivedTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(parameterValueEClass, ParameterValue.class, "ParameterValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getParameterValue_Parameter(), ecorePackage.getEParameter(), null, "parameter", null, 1, 1, ParameterValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
- IS_ORDERED);
- initEAttribute(getParameterValue_Value(), ecorePackage.getEJavaObject(), "value", null, 0, 1, ParameterValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(documentedElementEClass, DocumentedElement.class, "DocumentedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getDocumentedElement_Documentation(), ecorePackage.getEString(), "documentation", null, 0, 1, DocumentedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize data types
- initEDataType(resourceEDataType, Resource.class, "Resource", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http://www.eclipse.org/emf/2002/Ecore
- createEcoreAnnotations();
- // GenModel
- createGenModel_1Annotations();
- // org.eclipse.ocl.ecore.OCL
- createOrgAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void createEcoreAnnotations() {
- String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
- addAnnotation(this,
- source,
- new String[] {
- "validationDelegates", "org.eclipse.ocl.ecore.OCL" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(facetEClass,
- source,
- new String[] {
- "validationDelegates", "( self.query.scope = self.facet.extendedMetaClass ) and ( self.query.name = self.name )" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(facetEClass,
- source,
- new String[] {
- "validationDelegates", "self.conformanceQuery.scope = self.extendedMetaClass" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
- /**
- * Initializes the annotations for <b>GenModel</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void createGenModel_1Annotations() {
- String source = "GenModel"; //$NON-NLS-1$
- addAnnotation(facetSetEClass,
- source,
- new String[] {
- "documentation", "A \"FacetSet\" is the root element of a facet model. It contains a list of \"Facet\"." //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(facetSetEClass.getEOperations().get(0),
- source,
- new String[] {
- "documentation", "The FacetSets aggregated by this FacetSet (this operation is overridden in Aggregate in the aggregate metamodel)." //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getFacet_ExtendedMetaclass(),
- source,
- new String[] {
- "documentation", "The \"extendedMetaclass\" reference references the virtually subtyped EClass." //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getFacet_ExtendedFacets(),
- source,
- new String[] {
- "documentation", "A facet can extend other facets. If A facet A can extend a facet B. In this case an eObject conforms to the facet A if it matches conformance evaluation of A and B. " //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
- /**
- * Initializes the annotations for <b>org.eclipse.ocl.ecore.OCL</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void createOrgAnnotations() {
- String source = "org.eclipse.ocl.ecore.OCL"; //$NON-NLS-1$
- addAnnotation(facetEClass,
- source,
- new String[] {
- "body", "not(self.container().oclCastAs(FacetSet).facets->exists(f|f.extendedMetaClass.container() <> self.extendedMetaClass.container() ))" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
-} // EFacetPackageImpl
+/** + * Copyright (c) 2011, 2012 Mia-Software. + * + * 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: + * Gregoire Dupe (Mia-Software) - Design + * Nicolas Guyomar (Mia-Software) - Implementation + * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. + * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model + * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework + * Gregoire Dupe (Mia-Software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet. + * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning + * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet + */ +package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl; + +import static org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage.RESOURCE; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.impl.EPackageImpl; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Category; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.ExtensiblePackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.impl.ExtensiblePackageImpl; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.impl.QueryPackageImpl; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.RuntimePackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.impl.RuntimePackageImpl; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.SerializationPackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.impl.SerializationPackageImpl; + +/** + * <!-- begin-user-doc --> + * An implementation of the model <b>Package</b>. + * <!-- end-user-doc --> + * + * @generated + */ +public class EFacetPackageImpl extends EPackageImpl implements EFacetPackage { + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass facetAttributeEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass facetReferenceEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass facetOperationEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass facetSetEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass facetEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass categoryEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass facetElementEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass derivedTypedElementEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass parameterValueEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EClass documentedElementEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private EDataType resourceEDataType = null; + + /** + * Creates an instance of the model <b>Package</b>, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + * <p> + * Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage#eNS_URI + * @see #init() + * @generated + */ + private EFacetPackageImpl() { + super(eNS_URI, EFacetFactory.eINSTANCE); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. + * + * <p> + * This method is used to initialize {@link EFacetPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static EFacetPackage init() { + if (isInited) { + return (EFacetPackage) EPackage.Registry.INSTANCE.getEPackage(EFacetPackage.eNS_URI); + } + + // Obtain or create and register package + EFacetPackageImpl theEFacetPackage = (EFacetPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EFacetPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EFacetPackageImpl()); + + isInited = true; + + // Obtain or create and register interdependencies + SerializationPackageImpl theSerializationPackage = (SerializationPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SerializationPackage.eNS_URI) instanceof SerializationPackageImpl + ? EPackage.Registry.INSTANCE.getEPackage(SerializationPackage.eNS_URI) : SerializationPackage.eINSTANCE); + ExtensiblePackageImpl theExtensiblePackage = (ExtensiblePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI) instanceof ExtensiblePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI) + : ExtensiblePackage.eINSTANCE); + QueryPackageImpl theQueryPackage = (QueryPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI) instanceof QueryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI) : QueryPackage.eINSTANCE); + RuntimePackageImpl theRuntimePackage = (RuntimePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RuntimePackage.eNS_URI) instanceof RuntimePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RuntimePackage.eNS_URI) : RuntimePackage.eINSTANCE); + + // Create package meta-data objects + theEFacetPackage.createPackageContents(); + theSerializationPackage.createPackageContents(); + theExtensiblePackage.createPackageContents(); + theQueryPackage.createPackageContents(); + theRuntimePackage.createPackageContents(); + + // Initialize created meta-data + theEFacetPackage.initializePackageContents(); + theSerializationPackage.initializePackageContents(); + theExtensiblePackage.initializePackageContents(); + theQueryPackage.initializePackageContents(); + theRuntimePackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theEFacetPackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(EFacetPackage.eNS_URI, theEFacetPackage); + return theEFacetPackage; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getFacetAttribute() { + return facetAttributeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getFacetReference() { + return facetReferenceEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getFacetOperation() { + return facetOperationEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getFacetSet() { + return facetSetEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getFacetSet_Categories() { + return (EReference) facetSetEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getFacet() { + return facetEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getFacet_ExtendedMetaclass() { + return (EReference) facetEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getFacet_FacetElements() { + return (EReference) facetEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getFacet_FacetOperations() { + return (EReference) facetEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getFacet_ConformanceTypedElement() { + return (EReference) facetEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getFacet_ExtendedFacets() { + return (EReference) facetEClass.getEStructuralFeatures().get(4); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + public EReference getFacet_AllTypedElements() { + return (EReference) facetEClass.getEStructuralFeatures().get(5); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + public EReference getFacet_AllFacetOperations() { + return (EReference) facetEClass.getEStructuralFeatures().get(6); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.2 + */ + public EReference getFacet_AllFacetElements() { + return (EReference) facetEClass.getEStructuralFeatures().get(7); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getCategory() { + return categoryEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getFacetElement() { + return facetElementEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getFacetElement_Categories() { + return (EReference) facetElementEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getDerivedTypedElement() { + return derivedTypedElementEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getDerivedTypedElement_Query() { + return (EReference) derivedTypedElementEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getDerivedTypedElement_Override() { + return (EReference) derivedTypedElementEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getParameterValue() { + return parameterValueEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EReference getParameterValue_Parameter() { + return (EReference) parameterValueEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EAttribute getParameterValue_Value() { + return (EAttribute) parameterValueEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getDocumentedElement() { + return documentedElementEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EAttribute getDocumentedElement_Documentation() { + return (EAttribute) documentedElementEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EDataType getResource() { + return resourceEDataType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EFacetFactory getEFacetFactory() { + return (EFacetFactory) getEFactoryInstance(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public void createPackageContents() { + if (isCreated) { + return; + } + isCreated = true; + + // Create classes and their features + facetAttributeEClass = createEClass(FACET_ATTRIBUTE); + + facetReferenceEClass = createEClass(FACET_REFERENCE); + + facetOperationEClass = createEClass(FACET_OPERATION); + + facetSetEClass = createEClass(FACET_SET); + createEReference(facetSetEClass, FACET_SET__CATEGORIES); + + facetEClass = createEClass(FACET); + createEReference(facetEClass, FACET__EXTENDED_METACLASS); + createEReference(facetEClass, FACET__FACET_ELEMENTS); + createEReference(facetEClass, FACET__FACET_OPERATIONS); + createEReference(facetEClass, FACET__CONFORMANCE_TYPED_ELEMENT); + createEReference(facetEClass, FACET__EXTENDED_FACETS); + createEReference(facetEClass, FACET__ALL_TYPED_ELEMENTS); + createEReference(facetEClass, FACET__ALL_FACET_OPERATIONS); + createEReference(facetEClass, FACET__ALL_FACET_ELEMENTS); + + categoryEClass = createEClass(CATEGORY); + + facetElementEClass = createEClass(FACET_ELEMENT); + createEReference(facetElementEClass, FACET_ELEMENT__CATEGORIES); + + derivedTypedElementEClass = createEClass(DERIVED_TYPED_ELEMENT); + createEReference(derivedTypedElementEClass, DERIVED_TYPED_ELEMENT__QUERY); + createEReference(derivedTypedElementEClass, DERIVED_TYPED_ELEMENT__OVERRIDE); + + parameterValueEClass = createEClass(PARAMETER_VALUE); + createEReference(parameterValueEClass, PARAMETER_VALUE__PARAMETER); + createEAttribute(parameterValueEClass, PARAMETER_VALUE__VALUE); + + documentedElementEClass = createEClass(DOCUMENTED_ELEMENT); + createEAttribute(documentedElementEClass, DOCUMENTED_ELEMENT__DOCUMENTATION); + + // Create data types + resourceEDataType = createEDataType(RESOURCE); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) { + return; + } + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + SerializationPackage theSerializationPackage = (SerializationPackage) EPackage.Registry.INSTANCE.getEPackage(SerializationPackage.eNS_URI); + ExtensiblePackage theExtensiblePackage = (ExtensiblePackage) EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI); + QueryPackage theQueryPackage = (QueryPackage) EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI); + RuntimePackage theRuntimePackage = (RuntimePackage) EPackage.Registry.INSTANCE.getEPackage(RuntimePackage.eNS_URI); + + // Add subpackages + getESubpackages().add(theSerializationPackage); + getESubpackages().add(theExtensiblePackage); + getESubpackages().add(theQueryPackage); + getESubpackages().add(theRuntimePackage); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + facetAttributeEClass.getESuperTypes().add(ecorePackage.getEAttribute()); + facetAttributeEClass.getESuperTypes().add(this.getDerivedTypedElement()); + facetReferenceEClass.getESuperTypes().add(ecorePackage.getEReference()); + facetReferenceEClass.getESuperTypes().add(this.getDerivedTypedElement()); + facetOperationEClass.getESuperTypes().add(ecorePackage.getEOperation()); + facetOperationEClass.getESuperTypes().add(this.getDerivedTypedElement()); + facetSetEClass.getESuperTypes().add(ecorePackage.getEPackage()); + facetSetEClass.getESuperTypes().add(this.getDocumentedElement()); + facetEClass.getESuperTypes().add(ecorePackage.getEClassifier()); + facetEClass.getESuperTypes().add(this.getDocumentedElement()); + categoryEClass.getESuperTypes().add(ecorePackage.getENamedElement()); + categoryEClass.getESuperTypes().add(this.getDocumentedElement()); + facetElementEClass.getESuperTypes().add(ecorePackage.getETypedElement()); + facetElementEClass.getESuperTypes().add(this.getDocumentedElement()); + derivedTypedElementEClass.getESuperTypes().add(this.getFacetElement()); + + // Initialize classes and features; add operations and parameters + initEClass(facetAttributeEClass, FacetAttribute.class, "FacetAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(facetReferenceEClass, FacetReference.class, "FacetReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(facetOperationEClass, FacetOperation.class, "FacetOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(facetSetEClass, FacetSet.class, "FacetSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getFacetSet_Categories(), this.getCategory(), null, "categories", null, 0, -1, FacetSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + + addEOperation(facetSetEClass, this.getFacetSet(), "getFacetSets", 0, -1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + + initEClass(facetEClass, Facet.class, "Facet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getFacet_ExtendedMetaclass(), ecorePackage.getEClass(), null, "extendedMetaclass", null, 0, 1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + IS_ORDERED); + initEReference(getFacet_FacetElements(), ecorePackage.getEStructuralFeature(), null, "facetElements", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + IS_ORDERED); + initEReference(getFacet_FacetOperations(), this.getFacetOperation(), null, "facetOperations", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEReference(getFacet_ConformanceTypedElement(), ecorePackage.getETypedElement(), null, "conformanceTypedElement", null, 0, 1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$ + !IS_DERIVED, IS_ORDERED); + initEReference(getFacet_ExtendedFacets(), this.getFacet(), null, "extendedFacets", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEReference(getFacet_AllTypedElements(), ecorePackage.getETypedElement(), null, "allTypedElements", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$ + IS_ORDERED); + initEReference(getFacet_AllFacetOperations(), this.getFacetOperation(), null, "allFacetOperations", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$ + IS_ORDERED); + initEReference(getFacet_AllFacetElements(), ecorePackage.getEStructuralFeature(), null, "allFacetElements", null, 0, -1, Facet.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$ + IS_ORDERED); + + initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(facetElementEClass, FacetElement.class, "FacetElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getFacetElement_Categories(), this.getCategory(), null, "categories", null, 0, -1, FacetElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + + initEClass(derivedTypedElementEClass, DerivedTypedElement.class, "DerivedTypedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getDerivedTypedElement_Query(), theExtensiblePackage.getQuery(), null, "query", null, 1, 1, DerivedTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + IS_ORDERED); + initEReference(getDerivedTypedElement_Override(), this.getDerivedTypedElement(), null, "override", null, 0, 1, DerivedTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$ + !IS_DERIVED, IS_ORDERED); + + initEClass(parameterValueEClass, ParameterValue.class, "ParameterValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getParameterValue_Parameter(), ecorePackage.getEParameter(), null, "parameter", null, 1, 1, ParameterValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + IS_ORDERED); + initEAttribute(getParameterValue_Value(), ecorePackage.getEJavaObject(), "value", null, 0, 1, ParameterValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + + initEClass(documentedElementEClass, DocumentedElement.class, "DocumentedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getDocumentedElement_Documentation(), ecorePackage.getEString(), "documentation", null, 0, 1, DocumentedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + + // Initialize data types + initEDataType(resourceEDataType, Resource.class, "Resource", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + // Create resource + createResource(eNS_URI); + + // Create annotations + // http://www.eclipse.org/emf/2002/Ecore + createEcoreAnnotations(); + // GenModel + createGenModel_1Annotations(); + // org.eclipse.ocl.ecore.OCL + createOrgAnnotations(); + } + + /** + * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void createEcoreAnnotations() { + String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$ + addAnnotation(this, + source, + new String[] { + "validationDelegates", "org.eclipse.ocl.ecore.OCL" //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation(facetEClass, + source, + new String[] { + "validationDelegates", "( self.query.scope = self.facet.extendedMetaClass ) and ( self.query.name = self.name )" //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation(facetEClass, + source, + new String[] { + "validationDelegates", "self.conformanceQuery.scope = self.extendedMetaClass" //$NON-NLS-1$ //$NON-NLS-2$ + }); + } + + /** + * Initializes the annotations for <b>GenModel</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void createGenModel_1Annotations() { + String source = "GenModel"; //$NON-NLS-1$ + addAnnotation(facetSetEClass, + source, + new String[] { + "documentation", "A \"FacetSet\" is the root element of a facet model. It contains a list of \"Facet\"." //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation(facetSetEClass.getEOperations().get(0), + source, + new String[] { + "documentation", "The FacetSets aggregated by this FacetSet (this operation is overridden in Aggregate in the aggregate metamodel)." //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation(getFacet_ExtendedMetaclass(), + source, + new String[] { + "documentation", "The \"extendedMetaclass\" reference references the virtually subtyped EClass." //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation(getFacet_ExtendedFacets(), + source, + new String[] { + "documentation", "A facet can extend other facets. If A facet A can extend a facet B. In this case an eObject conforms to the facet A if it matches conformance evaluation of A and B. " //$NON-NLS-1$ //$NON-NLS-2$ + }); + } + + /** + * Initializes the annotations for <b>org.eclipse.ocl.ecore.OCL</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected void createOrgAnnotations() { + String source = "org.eclipse.ocl.ecore.OCL"; //$NON-NLS-1$ + addAnnotation(facetEClass, + source, + new String[] { + "body", "not(self.container().oclCastAs(FacetSet).facets->exists(f|f.extendedMetaClass.container() <> self.extendedMetaClass.container() ))" //$NON-NLS-1$ //$NON-NLS-2$ + }); + } + +} // EFacetPackageImpl diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java index a6c84e8731c..fdb80d42dbc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java @@ -1,638 +1,644 @@ -/**
- * Copyright (c) 2011 Mia-Software.
- *
- * 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:
- * Gregoire Dupe (Mia-Software) - Design
- * Nicolas Guyomar (Mia-Software) - Implementation
- * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.
- * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model
- * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework
- * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning
- * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet
- */
-package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EClassifierImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facet</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getDocumentation <em>Documentation</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getExtendedMetaclass <em>Extended Metaclass</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getFacetElements <em>Facet Elements</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getFacetOperations <em>Facet Operations</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getConformanceTypedElement <em>Conformance Typed Element</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getExtendedFacets <em>Extended Facets</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getAllTypedElements <em>All Typed Elements</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getAllFacetOperations <em>All Facet Operations</em>}</li>
- * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getAllFacetElements <em>All Facet Elements</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class FacetImpl extends EClassifierImpl implements Facet {
- /**
- * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getDocumentation()
- * @generated
- * @ordered
- */
- protected static final String DOCUMENTATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getDocumentation()
- * @generated
- * @ordered
- */
- protected String documentation = DOCUMENTATION_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getExtendedMetaclass() <em>Extended Metaclass</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getExtendedMetaclass()
- * @generated
- * @ordered
- */
- protected EClass extendedMetaclass;
-
- /**
- * The cached value of the '{@link #getFacetElements() <em>Facet Elements</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getFacetElements()
- * @generated
- * @ordered
- */
- protected EList<EStructuralFeature> facetElements;
-
- /**
- * The cached value of the '{@link #getFacetOperations() <em>Facet Operations</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getFacetOperations()
- * @generated
- * @ordered
- */
- protected EList<FacetOperation> facetOperations;
-
- /**
- * The cached value of the '{@link #getConformanceTypedElement() <em>Conformance Typed Element</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getConformanceTypedElement()
- * @generated
- * @ordered
- */
- protected ETypedElement conformanceTypedElement;
-
- /**
- * The cached value of the '{@link #getExtendedFacets() <em>Extended Facets</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getExtendedFacets()
- * @generated
- * @ordered
- */
- protected EList<Facet> extendedFacets;
-
- /**
- * The cached value of the '{@link #getAllTypedElements() <em>All Typed Elements</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getAllTypedElements()
- * @generated
- * @ordered
- */
- protected EList<ETypedElement> allTypedElements;
-
- /**
- * The cached value of the '{@link #getAllFacetOperations() <em>All Facet Operations</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getAllFacetOperations()
- * @generated
- * @ordered
- */
- protected EList<FacetOperation> allFacetOperations;
-
- /**
- * The cached value of the '{@link #getAllFacetElements() <em>All Facet Elements</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getAllFacetElements()
- * @generated
- * @ordered
- */
- protected EList<EStructuralFeature> allFacetElements;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected FacetImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return EFacetPackage.Literals.FACET;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getDocumentation() {
- return documentation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setDocumentation(String newDocumentation) {
- String oldDocumentation = documentation;
- documentation = newDocumentation;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, EFacetPackage.FACET__DOCUMENTATION, oldDocumentation, documentation));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public FacetSet basicGetFacetSet() {
- if (getEPackage() instanceof FacetSet) {
- FacetSet facetSet = (FacetSet) getEPackage();
- return facetSet;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setFacetSet(final FacetSet newFacetSet) {
- newFacetSet.getEClassifiers().add(this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getExtendedMetaclass() {
- if (extendedMetaclass != null && extendedMetaclass.eIsProxy()) {
- InternalEObject oldExtendedMetaclass = (InternalEObject) extendedMetaclass;
- extendedMetaclass = (EClass) eResolveProxy(oldExtendedMetaclass);
- if (extendedMetaclass != oldExtendedMetaclass) {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, EFacetPackage.FACET__EXTENDED_METACLASS, oldExtendedMetaclass, extendedMetaclass));
- }
- }
- }
- return extendedMetaclass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public EClass basicGetExtendedMetaclass() {
- if (this.extendedMetaclass != null && this.extendedMetaclass.eIsProxy()) {
- InternalEObject oldExtendedMetaclass = (InternalEObject) this.extendedMetaclass;
- this.extendedMetaclass = (EClass) eResolveProxy(oldExtendedMetaclass);
- if (this.extendedMetaclass != oldExtendedMetaclass) {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, EFacetPackage.FACET__EXTENDED_METACLASS, oldExtendedMetaclass, this.extendedMetaclass));
- }
- }
- }
- return this.extendedMetaclass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setExtendedMetaclass(EClass newExtendedMetaclass) {
- EClass oldExtendedMetaclass = extendedMetaclass;
- extendedMetaclass = newExtendedMetaclass;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, EFacetPackage.FACET__EXTENDED_METACLASS, oldExtendedMetaclass, extendedMetaclass));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<EStructuralFeature> getFacetElements() {
- if (facetElements == null) {
- facetElements = new EObjectContainmentEList<EStructuralFeature>(EStructuralFeature.class, this, EFacetPackage.FACET__FACET_ELEMENTS);
- }
- return facetElements;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<FacetOperation> getFacetOperations() {
- if (facetOperations == null) {
- facetOperations = new EObjectContainmentEList<FacetOperation>(FacetOperation.class, this, EFacetPackage.FACET__FACET_OPERATIONS);
- }
- return facetOperations;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ETypedElement getConformanceTypedElement() {
- if (conformanceTypedElement != null && conformanceTypedElement.eIsProxy()) {
- InternalEObject oldConformanceTypedElement = (InternalEObject) conformanceTypedElement;
- conformanceTypedElement = (ETypedElement) eResolveProxy(oldConformanceTypedElement);
- if (conformanceTypedElement != oldConformanceTypedElement) {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT, oldConformanceTypedElement, conformanceTypedElement));
- }
- }
- }
- return conformanceTypedElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ETypedElement basicGetConformanceTypedElement() {
- return conformanceTypedElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setConformanceTypedElement(ETypedElement newConformanceTypedElement) {
- ETypedElement oldConformanceTypedElement = conformanceTypedElement;
- conformanceTypedElement = newConformanceTypedElement;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT, oldConformanceTypedElement, conformanceTypedElement));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<Facet> getExtendedFacets() {
- if (extendedFacets == null) {
- extendedFacets = new EObjectResolvingEList<Facet>(Facet.class, this, EFacetPackage.FACET__EXTENDED_FACETS);
- }
- return extendedFacets;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public EList<ETypedElement> getAllTypedElements() {
- if (allTypedElements == null) {
- allTypedElements = new BasicEList<ETypedElement>();
- allTypedElements.addAll(getAllFacetElements());
- allTypedElements.addAll(getAllFacetOperations());
- allTypedElements = ECollections.unmodifiableEList(allTypedElements);
- }
- return allTypedElements;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public EList<FacetOperation> getAllFacetOperations() {
- if (allFacetOperations == null) {
- allFacetOperations = new UniqueEList.FastCompare<FacetOperation>();
- for (Facet facet : getExtendedFacets()) {
- allFacetOperations.addAll(facet.getAllFacetOperations());
- }
- allFacetOperations.addAll(getFacetOperations());
- allFacetOperations = ECollections.unmodifiableEList(allFacetOperations);
- }
- return allFacetOperations;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public EList<EStructuralFeature> getAllFacetElements() {
- if (allFacetElements == null) {
- allFacetElements = new UniqueEList.FastCompare<EStructuralFeature>();
- for (Facet facet : getExtendedFacets()) {
- allFacetElements.addAll(facet.getAllFacetElements());
- }
- allFacetElements.addAll(getFacetElements());
- allFacetElements = ECollections.unmodifiableEList(allFacetElements);
- }
- return allFacetElements;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case EFacetPackage.FACET__FACET_ELEMENTS:
- return ((InternalEList<?>) getFacetElements()).basicRemove(otherEnd, msgs);
- case EFacetPackage.FACET__FACET_OPERATIONS:
- return ((InternalEList<?>) getFacetOperations()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case EFacetPackage.FACET__DOCUMENTATION:
- return getDocumentation();
- case EFacetPackage.FACET__EXTENDED_METACLASS:
- if (resolve) {
- return getExtendedMetaclass();
- }
- return basicGetExtendedMetaclass();
- case EFacetPackage.FACET__FACET_ELEMENTS:
- return getFacetElements();
- case EFacetPackage.FACET__FACET_OPERATIONS:
- return getFacetOperations();
- case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT:
- if (resolve) {
- return getConformanceTypedElement();
- }
- return basicGetConformanceTypedElement();
- case EFacetPackage.FACET__EXTENDED_FACETS:
- return getExtendedFacets();
- case EFacetPackage.FACET__ALL_TYPED_ELEMENTS:
- return getAllTypedElements();
- case EFacetPackage.FACET__ALL_FACET_OPERATIONS:
- return getAllFacetOperations();
- case EFacetPackage.FACET__ALL_FACET_ELEMENTS:
- return getAllFacetElements();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case EFacetPackage.FACET__DOCUMENTATION:
- setDocumentation((String) newValue);
- return;
- case EFacetPackage.FACET__EXTENDED_METACLASS:
- setExtendedMetaclass((EClass) newValue);
- return;
- case EFacetPackage.FACET__FACET_ELEMENTS:
- getFacetElements().clear();
- getFacetElements().addAll((Collection<? extends EStructuralFeature>) newValue);
- return;
- case EFacetPackage.FACET__FACET_OPERATIONS:
- getFacetOperations().clear();
- getFacetOperations().addAll((Collection<? extends FacetOperation>) newValue);
- return;
- case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT:
- setConformanceTypedElement((ETypedElement) newValue);
- return;
- case EFacetPackage.FACET__EXTENDED_FACETS:
- getExtendedFacets().clear();
- getExtendedFacets().addAll((Collection<? extends Facet>) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case EFacetPackage.FACET__DOCUMENTATION:
- setDocumentation(DOCUMENTATION_EDEFAULT);
- return;
- case EFacetPackage.FACET__EXTENDED_METACLASS:
- setExtendedMetaclass((EClass) null);
- return;
- case EFacetPackage.FACET__FACET_ELEMENTS:
- getFacetElements().clear();
- return;
- case EFacetPackage.FACET__FACET_OPERATIONS:
- getFacetOperations().clear();
- return;
- case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT:
- setConformanceTypedElement((ETypedElement) null);
- return;
- case EFacetPackage.FACET__EXTENDED_FACETS:
- getExtendedFacets().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case EFacetPackage.FACET__DOCUMENTATION:
- return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
- case EFacetPackage.FACET__EXTENDED_METACLASS:
- return extendedMetaclass != null;
- case EFacetPackage.FACET__FACET_ELEMENTS:
- return facetElements != null && !facetElements.isEmpty();
- case EFacetPackage.FACET__FACET_OPERATIONS:
- return facetOperations != null && !facetOperations.isEmpty();
- case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT:
- return conformanceTypedElement != null;
- case EFacetPackage.FACET__EXTENDED_FACETS:
- return extendedFacets != null && !extendedFacets.isEmpty();
- case EFacetPackage.FACET__ALL_TYPED_ELEMENTS:
- return allTypedElements != null && !allTypedElements.isEmpty();
- case EFacetPackage.FACET__ALL_FACET_OPERATIONS:
- return allFacetOperations != null && !allFacetOperations.isEmpty();
- case EFacetPackage.FACET__ALL_FACET_ELEMENTS:
- return allFacetElements != null && !allFacetElements.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == DocumentedElement.class) {
- switch (derivedFeatureID) {
- case EFacetPackage.FACET__DOCUMENTATION:
- return EFacetPackage.DOCUMENTED_ELEMENT__DOCUMENTATION;
- default:
- return -1;
- }
- }
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == DocumentedElement.class) {
- switch (baseFeatureID) {
- case EFacetPackage.DOCUMENTED_ELEMENT__DOCUMENTATION:
- return EFacetPackage.FACET__DOCUMENTATION;
- default:
- return -1;
- }
- }
- return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) {
- return super.toString();
- }
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (documentation: "); //$NON-NLS-1$
- result.append(documentation);
- result.append(')');
- return result.toString();
- }
-
-} // FacetImpl
+/** + * Copyright (c) 2011 Mia-Software. + * + * 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: + * Gregoire Dupe (Mia-Software) - Design + * Nicolas Guyomar (Mia-Software) - Implementation + * Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. + * Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model + * Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework + * Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning + * Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet + */ +package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.BasicEList; +import org.eclipse.emf.common.util.ECollections; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.UniqueEList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.ETypedElement; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.EClassifierImpl; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.EObjectResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DocumentedElement; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; +import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Facet</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getDocumentation <em>Documentation</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getExtendedMetaclass <em>Extended Metaclass</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getFacetElements <em>Facet Elements</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getFacetOperations <em>Facet Operations</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getConformanceTypedElement <em>Conformance Typed Element</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getExtendedFacets <em>Extended Facets</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getAllTypedElements <em>All Typed Elements</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getAllFacetOperations <em>All Facet Operations</em>}</li> + * <li>{@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetImpl#getAllFacetElements <em>All Facet Elements</em>}</li> + * </ul> + * + * @generated + */ +public class FacetImpl extends EClassifierImpl implements Facet { + /** + * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getDocumentation() + * @generated + * @ordered + */ + protected static final String DOCUMENTATION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getDocumentation() + * @generated + * @ordered + */ + protected String documentation = DOCUMENTATION_EDEFAULT; + + /** + * The cached value of the '{@link #getExtendedMetaclass() <em>Extended Metaclass</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getExtendedMetaclass() + * @generated + * @ordered + */ + protected EClass extendedMetaclass; + + /** + * The cached value of the '{@link #getFacetElements() <em>Facet Elements</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getFacetElements() + * @generated + * @ordered + */ + protected EList<EStructuralFeature> facetElements; + + /** + * The cached value of the '{@link #getFacetOperations() <em>Facet Operations</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getFacetOperations() + * @generated + * @ordered + */ + protected EList<FacetOperation> facetOperations; + + /** + * The cached value of the '{@link #getConformanceTypedElement() <em>Conformance Typed Element</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getConformanceTypedElement() + * @generated + * @ordered + */ + protected ETypedElement conformanceTypedElement; + + /** + * The cached value of the '{@link #getExtendedFacets() <em>Extended Facets</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getExtendedFacets() + * @generated + * @ordered + */ + protected EList<Facet> extendedFacets; + + /** + * The cached value of the '{@link #getAllTypedElements() <em>All Typed Elements</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getAllTypedElements() + * @generated + * @ordered + * @since 1.2 + */ + protected EList<ETypedElement> allTypedElements; + + /** + * The cached value of the '{@link #getAllFacetOperations() <em>All Facet Operations</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getAllFacetOperations() + * @generated + * @ordered + * @since 1.2 + */ + protected EList<FacetOperation> allFacetOperations; + + /** + * The cached value of the '{@link #getAllFacetElements() <em>All Facet Elements</em>}' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getAllFacetElements() + * @generated + * @ordered + * @since 1.2 + */ + protected EList<EStructuralFeature> allFacetElements; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected FacetImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return EFacetPackage.Literals.FACET; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public String getDocumentation() { + return documentation; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public void setDocumentation(String newDocumentation) { + String oldDocumentation = documentation; + documentation = newDocumentation; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EFacetPackage.FACET__DOCUMENTATION, oldDocumentation, documentation)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated NOT + */ + public FacetSet basicGetFacetSet() { + if (getEPackage() instanceof FacetSet) { + FacetSet facetSet = (FacetSet) getEPackage(); + return facetSet; + } + return null; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated NOT + */ + public void setFacetSet(final FacetSet newFacetSet) { + newFacetSet.getEClassifiers().add(this); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EClass getExtendedMetaclass() { + if (extendedMetaclass != null && extendedMetaclass.eIsProxy()) { + InternalEObject oldExtendedMetaclass = (InternalEObject) extendedMetaclass; + extendedMetaclass = (EClass) eResolveProxy(oldExtendedMetaclass); + if (extendedMetaclass != oldExtendedMetaclass) { + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, EFacetPackage.FACET__EXTENDED_METACLASS, oldExtendedMetaclass, extendedMetaclass)); + } + } + } + return extendedMetaclass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated NOT + */ + public EClass basicGetExtendedMetaclass() { + if (this.extendedMetaclass != null && this.extendedMetaclass.eIsProxy()) { + InternalEObject oldExtendedMetaclass = (InternalEObject) this.extendedMetaclass; + this.extendedMetaclass = (EClass) eResolveProxy(oldExtendedMetaclass); + if (this.extendedMetaclass != oldExtendedMetaclass) { + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, EFacetPackage.FACET__EXTENDED_METACLASS, oldExtendedMetaclass, this.extendedMetaclass)); + } + } + } + return this.extendedMetaclass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public void setExtendedMetaclass(EClass newExtendedMetaclass) { + EClass oldExtendedMetaclass = extendedMetaclass; + extendedMetaclass = newExtendedMetaclass; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EFacetPackage.FACET__EXTENDED_METACLASS, oldExtendedMetaclass, extendedMetaclass)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EList<EStructuralFeature> getFacetElements() { + if (facetElements == null) { + facetElements = new EObjectContainmentEList<EStructuralFeature>(EStructuralFeature.class, this, EFacetPackage.FACET__FACET_ELEMENTS); + } + return facetElements; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EList<FacetOperation> getFacetOperations() { + if (facetOperations == null) { + facetOperations = new EObjectContainmentEList<FacetOperation>(FacetOperation.class, this, EFacetPackage.FACET__FACET_OPERATIONS); + } + return facetOperations; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public ETypedElement getConformanceTypedElement() { + if (conformanceTypedElement != null && conformanceTypedElement.eIsProxy()) { + InternalEObject oldConformanceTypedElement = (InternalEObject) conformanceTypedElement; + conformanceTypedElement = (ETypedElement) eResolveProxy(oldConformanceTypedElement); + if (conformanceTypedElement != oldConformanceTypedElement) { + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT, oldConformanceTypedElement, conformanceTypedElement)); + } + } + } + return conformanceTypedElement; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public ETypedElement basicGetConformanceTypedElement() { + return conformanceTypedElement; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public void setConformanceTypedElement(ETypedElement newConformanceTypedElement) { + ETypedElement oldConformanceTypedElement = conformanceTypedElement; + conformanceTypedElement = newConformanceTypedElement; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT, oldConformanceTypedElement, conformanceTypedElement)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public EList<Facet> getExtendedFacets() { + if (extendedFacets == null) { + extendedFacets = new EObjectResolvingEList<Facet>(Facet.class, this, EFacetPackage.FACET__EXTENDED_FACETS); + } + return extendedFacets; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated NOT + * @since 1.2 + */ + public EList<ETypedElement> getAllTypedElements() { + if (allTypedElements == null) { + allTypedElements = new BasicEList<ETypedElement>(); + allTypedElements.addAll(getAllFacetElements()); + allTypedElements.addAll(getAllFacetOperations()); + allTypedElements = ECollections.unmodifiableEList(allTypedElements); + } + return allTypedElements; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated NOT + * @since 1.2 + */ + public EList<FacetOperation> getAllFacetOperations() { + if (allFacetOperations == null) { + allFacetOperations = new UniqueEList.FastCompare<FacetOperation>(); + for (Facet facet : getExtendedFacets()) { + allFacetOperations.addAll(facet.getAllFacetOperations()); + } + allFacetOperations.addAll(getFacetOperations()); + allFacetOperations = ECollections.unmodifiableEList(allFacetOperations); + } + return allFacetOperations; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated NOT + * @since 1.2 + */ + public EList<EStructuralFeature> getAllFacetElements() { + if (allFacetElements == null) { + allFacetElements = new UniqueEList.FastCompare<EStructuralFeature>(); + for (Facet facet : getExtendedFacets()) { + allFacetElements.addAll(facet.getAllFacetElements()); + } + allFacetElements.addAll(getFacetElements()); + allFacetElements = ECollections.unmodifiableEList(allFacetElements); + } + return allFacetElements; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case EFacetPackage.FACET__FACET_ELEMENTS: + return ((InternalEList<?>) getFacetElements()).basicRemove(otherEnd, msgs); + case EFacetPackage.FACET__FACET_OPERATIONS: + return ((InternalEList<?>) getFacetOperations()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EFacetPackage.FACET__DOCUMENTATION: + return getDocumentation(); + case EFacetPackage.FACET__EXTENDED_METACLASS: + if (resolve) { + return getExtendedMetaclass(); + } + return basicGetExtendedMetaclass(); + case EFacetPackage.FACET__FACET_ELEMENTS: + return getFacetElements(); + case EFacetPackage.FACET__FACET_OPERATIONS: + return getFacetOperations(); + case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT: + if (resolve) { + return getConformanceTypedElement(); + } + return basicGetConformanceTypedElement(); + case EFacetPackage.FACET__EXTENDED_FACETS: + return getExtendedFacets(); + case EFacetPackage.FACET__ALL_TYPED_ELEMENTS: + return getAllTypedElements(); + case EFacetPackage.FACET__ALL_FACET_OPERATIONS: + return getAllFacetOperations(); + case EFacetPackage.FACET__ALL_FACET_ELEMENTS: + return getAllFacetElements(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EFacetPackage.FACET__DOCUMENTATION: + setDocumentation((String) newValue); + return; + case EFacetPackage.FACET__EXTENDED_METACLASS: + setExtendedMetaclass((EClass) newValue); + return; + case EFacetPackage.FACET__FACET_ELEMENTS: + getFacetElements().clear(); + getFacetElements().addAll((Collection<? extends EStructuralFeature>) newValue); + return; + case EFacetPackage.FACET__FACET_OPERATIONS: + getFacetOperations().clear(); + getFacetOperations().addAll((Collection<? extends FacetOperation>) newValue); + return; + case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT: + setConformanceTypedElement((ETypedElement) newValue); + return; + case EFacetPackage.FACET__EXTENDED_FACETS: + getExtendedFacets().clear(); + getExtendedFacets().addAll((Collection<? extends Facet>) newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EFacetPackage.FACET__DOCUMENTATION: + setDocumentation(DOCUMENTATION_EDEFAULT); + return; + case EFacetPackage.FACET__EXTENDED_METACLASS: + setExtendedMetaclass((EClass) null); + return; + case EFacetPackage.FACET__FACET_ELEMENTS: + getFacetElements().clear(); + return; + case EFacetPackage.FACET__FACET_OPERATIONS: + getFacetOperations().clear(); + return; + case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT: + setConformanceTypedElement((ETypedElement) null); + return; + case EFacetPackage.FACET__EXTENDED_FACETS: + getExtendedFacets().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EFacetPackage.FACET__DOCUMENTATION: + return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation); + case EFacetPackage.FACET__EXTENDED_METACLASS: + return extendedMetaclass != null; + case EFacetPackage.FACET__FACET_ELEMENTS: + return facetElements != null && !facetElements.isEmpty(); + case EFacetPackage.FACET__FACET_OPERATIONS: + return facetOperations != null && !facetOperations.isEmpty(); + case EFacetPackage.FACET__CONFORMANCE_TYPED_ELEMENT: + return conformanceTypedElement != null; + case EFacetPackage.FACET__EXTENDED_FACETS: + return extendedFacets != null && !extendedFacets.isEmpty(); + case EFacetPackage.FACET__ALL_TYPED_ELEMENTS: + return allTypedElements != null && !allTypedElements.isEmpty(); + case EFacetPackage.FACET__ALL_FACET_OPERATIONS: + return allFacetOperations != null && !allFacetOperations.isEmpty(); + case EFacetPackage.FACET__ALL_FACET_ELEMENTS: + return allFacetElements != null && !allFacetElements.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == DocumentedElement.class) { + switch (derivedFeatureID) { + case EFacetPackage.FACET__DOCUMENTATION: + return EFacetPackage.DOCUMENTED_ELEMENT__DOCUMENTATION; + default: + return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == DocumentedElement.class) { + switch (baseFeatureID) { + case EFacetPackage.DOCUMENTED_ELEMENT__DOCUMENTATION: + return EFacetPackage.FACET__DOCUMENTATION; + default: + return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (documentation: "); //$NON-NLS-1$ + result.append(documentation); + result.append(')'); + return result.toString(); + } + +} // FacetImpl diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.project index 1ed48482396..604c633947c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.sdk.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.sdk.ui</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF index 87837dfacaf..49e702e6b72 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF @@ -1,33 +1,27 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.sdk.ui.dialog,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.dialog.query,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.component.getorcreate,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.component.metaclass,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.component.query,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.creation,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.wizard,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.wizard.page,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.query
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.200",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.6.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.sdk.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet.sdk.ui.dialog, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.dialog.query, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.component.getorcreate, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.component.metaclass, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.component.query, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.widget.creation, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.wizard, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.wizard.page, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.handler.creation, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.query +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.sdk.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.project index 203638fd019..fcdf39fb80c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.project @@ -1,31 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet.ui</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF index 04ea75aec02..b03632daa8d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF @@ -1,37 +1,29 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet.ui,
- org.eclipse.papyrus.emf.facet.efacet.ui.internal.composites;x-friends:="org.eclipse.papyrus.emf.facet.query.java.ui",
- org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported;x-friends:="org.eclipse.papyrus.emf.facet.aggregate.tests",
- org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.dialog;x-friends:="org.eclipse.papyrus.emf.facet.widgets.table.ui,
- org.eclipse.papyrus.emf.facet.efacet.tests,
- org.eclipse.papyrus.emf.facet.aggregate.tests",
- org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.view;x-friends:="org.eclipse.papyrus.emf.facet.efacet.tests",
- org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.widget;x-friends:="org.eclipse.papyrus.emf.facet.efacet.tests",
- org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.wizard;x-friends:="org.eclipse.papyrus.emf.facet.query.java.ui",
- org.eclipse.papyrus.emf.facet.efacet.ui.internal.wizards;x-friends:="org.eclipse.papyrus.emf.facet.query.java.ui"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.ide,
- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.6.0",
- org.eclipse.emf.ecore.edit;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.ui,
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet.ui, + org.eclipse.papyrus.emf.facet.efacet.ui.internal.composites;x-friends:="org.eclipse.papyrus.emf.facet.query.java.ui", + org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported;x-friends:="org.eclipse.papyrus.emf.facet.aggregate.tests", + org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.dialog;x-friends:="org.eclipse.papyrus.emf.facet.widgets.table.ui, + org.eclipse.papyrus.emf.facet.efacet.tests, + org.eclipse.papyrus.emf.facet.aggregate.tests", + org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.view;x-friends:="org.eclipse.papyrus.emf.facet.efacet.tests", + org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.widget;x-friends:="org.eclipse.papyrus.emf.facet.efacet.tests", + org.eclipse.papyrus.emf.facet.efacet.ui.internal.exported.wizard;x-friends:="org.eclipse.papyrus.emf.facet.query.java.ui", + org.eclipse.papyrus.emf.facet.efacet.ui.internal.wizards;x-friends:="org.eclipse.papyrus.emf.facet.query.java.ui" +Require-Bundle: org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.project index a2e7fbaaf6a..c5078703c8d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.efacet</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.efacet</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF index 7893d29c37c..542210a66c8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.efacet,
- org.eclipse.papyrus.emf.facet.efacet.impl;x-friends:="org.eclipse.papyrus.emf.facet.query.java",
- org.eclipse.papyrus.emf.facet.efacet.util;x-friends:="org.eclipse.papyrus.emf.facet.query.java.edit"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.plugin.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.efacet, + org.eclipse.papyrus.emf.facet.efacet.impl;x-friends:="org.eclipse.papyrus.emf.facet.query.java", + org.eclipse.papyrus.emf.facet.efacet.util;x-friends:="org.eclipse.papyrus.emf.facet.query.java.edit" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.plugin.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.project index b4165374dd2..dbe61a4acf6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.query.java.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.query.java.core</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF index a1cd783babc..c3682395834 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF @@ -1,21 +1,18 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.query.java.core,
- org.eclipse.papyrus.emf.facet.query.java.core.internal.exceptions
-Require-Bundle: org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.query.java;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.core.internal.plugin.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.query.java.core, + org.eclipse.papyrus.emf.facet.query.java.core.internal.exceptions +Require-Bundle: org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.query.java;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.core.internal.plugin.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.core;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.project index e9522a8bca9..70f1df4be1d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.project @@ -1,30 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.query.java.metamodel</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.query.java.metamodel</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF index fbc06150721..81f8e05b2aa 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF @@ -1,14 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.emf.facet.query.java.metamodel.v0_2_0.javaquery
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.metamodel.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.metamodel;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.emf.facet.query.java.metamodel.v0_2_0.javaquery +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.metamodel.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.metamodel;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.project index 22e637cb92b..e828162715f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.project @@ -1,30 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.query.java.sdk.ui</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.query.java.sdk.ui</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF index 3426d0030f0..1bf8f467aea 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF @@ -1,27 +1,19 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.emf.common.ui;bundle-version="2.6.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
- org.eclipse.emf.codegen.ecore;bundle-version="2.6.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.jdt.ui;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.sdk.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.sdk.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)", + org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)", + org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.sdk.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.sdk.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.project index 54c3a9a5c5f..a5b1a3bf641 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.query.java</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.query.java</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF index 384e448771b..340e67704d5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF @@ -1,15 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.emf.facet.query.java.javaquery,
- org.eclipse.papyrus.emf.facet.query.java.javaquery.util;x-friends:="org.eclipse.papyrus.emf.facet.query.java.edit"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.emf.facet.query.java.javaquery, + org.eclipse.papyrus.emf.facet.query.java.javaquery.util;x-friends:="org.eclipse.papyrus.emf.facet.query.java.edit" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.project index ee253c8fb10..6add5db414a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.project @@ -1,30 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.query.ocl.core</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>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.query.ocl.core</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF index 87f0940a5ce..2108ce0fc3b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF @@ -1,19 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.core.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.ocl;bundle-version="3.0.0",
- org.eclipse.ocl.ecore;bundle-version="3.0.0",
- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.core.util +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.core;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.project index 0afbd58d34a..8c0ca9426aa 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.project @@ -1,28 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.query.ocl.metamodel</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.query.ocl.metamodel</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.settings/.api_filters b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.settings/.api_filters new file mode 100644 index 00000000000..c1f1ee7ae15 --- /dev/null +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.emf.facet.query.ocl.metamodel" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter comment="Re-exported Ecore bundle version previously was unbounded" id="927989779"> + <message_arguments> + <message_argument value="1.2.0"/> + <message_argument value="org.eclipse.emf.ecore"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF index c17db2a70b8..8d373f2a794 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery,
- org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery.impl,
- org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.metamodel;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery, + org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery.impl, + org.eclipse.papyrus.emf.facet.query.ocl.metamodel.oclquery.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.metamodel;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.project index 915e915596a..a162b952133 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.project @@ -1,30 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui</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>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF index b09671aa580..7eebbb5f78b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF @@ -1,23 +1,19 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.dialog,
- org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.widget,
- org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.widget.oclexpression
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.query.ocl.core;bundle-version="1.2.0",
- org.eclipse.ocl.ecore;bundle-version="3.0.0",
- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.dialog, + org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.widget, + org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.widget.oclexpression +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.sdk.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.query.ocl.metamodel;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.ocl.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.100,4.0.0)", + org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.project index 090f5aa0dfa..4063c9f5faa 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.project @@ -1,30 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.core</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF index 124711eaa02..c793c23290c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.core,
- org.eclipse.papyrus.emf.facet.util.core.internal,
- org.eclipse.papyrus.emf.facet.util.core.internal.exported
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.6.0",
- com.ibm.icu;bundle-version="4.2.1"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.core, + org.eclipse.papyrus.emf.facet.util.core.internal, + org.eclipse.papyrus.emf.facet.util.core.internal.exported +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + com.ibm.icu;bundle-version="54.0.0" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.core;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.project index f1b1f26cd94..28eb08abeed 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.emf.catalog</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.emf.catalog</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF index 1d4fc035f26..8dfc28741b8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.emf.catalog
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.catalog.plugin.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.catalog;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.emf.catalog +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.catalog.plugin.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.catalog;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.project index a2e0d0dc9af..f01f9f13493 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.project @@ -1,30 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.emf.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.emf.core</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF index e7988354a79..13eb02c70c5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF @@ -1,33 +1,30 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.emf.core,
- org.eclipse.papyrus.emf.facet.util.emf.core.command,
- org.eclipse.papyrus.emf.facet.util.emf.core.exception,
- org.eclipse.papyrus.emf.facet.util.emf.core.internal; x-friends:="org.eclipse.papyrus.emf.facet.util.emf.core.tests,
- org.eclipse.papyrus.emf.facet.widgets.nattable,
- org.eclipse.papyrus.emf.facet.efacet.core,
- org.eclipse.papyrus.emf.facet.util.emf.ui",
- org.eclipse.papyrus.emf.facet.util.emf.core.internal.catalog;x-internal:=true,
- org.eclipse.papyrus.emf.facet.util.emf.core.internal.exported,
- org.eclipse.papyrus.emf.facet.util.emf.core.internal.preferences,
- org.eclipse.papyrus.emf.facet.util.emf.core.internal.registry;x-internal:=true,
- org.eclipse.papyrus.emf.facet.util.emf.core.internal.serialization;x-internal:=true,
- org.eclipse.papyrus.emf.facet.util.emf.core.internal.serialization.serializers;x-internal:=true,
- org.eclipse.papyrus.emf.facet.util.emf.core.serialization,
- org.eclipse.papyrus.emf.facet.util.emf.core.serialization.model.serialization,
- org.eclipse.papyrus.emf.facet.util.emf.core.serialization.model.serialization.impl;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.2.0",
- org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.common.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.emf.core, + org.eclipse.papyrus.emf.facet.util.emf.core.command, + org.eclipse.papyrus.emf.facet.util.emf.core.exception, + org.eclipse.papyrus.emf.facet.util.emf.core.internal; x-friends:="org.eclipse.papyrus.emf.facet.util.emf.core.tests, + org.eclipse.papyrus.emf.facet.widgets.nattable, + org.eclipse.papyrus.emf.facet.efacet.core, + org.eclipse.papyrus.emf.facet.util.emf.ui", + org.eclipse.papyrus.emf.facet.util.emf.core.internal.catalog;x-internal:=true, + org.eclipse.papyrus.emf.facet.util.emf.core.internal.exported, + org.eclipse.papyrus.emf.facet.util.emf.core.internal.preferences, + org.eclipse.papyrus.emf.facet.util.emf.core.internal.registry;x-internal:=true, + org.eclipse.papyrus.emf.facet.util.emf.core.internal.serialization;x-internal:=true, + org.eclipse.papyrus.emf.facet.util.emf.core.internal.serialization.serializers;x-internal:=true, + org.eclipse.papyrus.emf.facet.util.emf.core.serialization, + org.eclipse.papyrus.emf.facet.util.emf.core.serialization.model.serialization, + org.eclipse.papyrus.emf.facet.util.emf.core.serialization.model.serialization.impl;x-internal:=true +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.common.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.core;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/.project index ed404432695..203f2567368 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/.project @@ -37,8 +37,26 @@ </dictionary> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF index 3ca554b10dd..3230d94080d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="3.5.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: EMFFacet EMF Utils Documentation (Incubation)
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.doc;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: EMFFacet EMF Utils Documentation (Incubation) +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.doc;singleton:=true diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.project index f911953f80c..e2637e7abda 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.project @@ -1,31 +1,44 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.emf.ui</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.emf.ui</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF index c27a857ec77..188885421f3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF @@ -1,35 +1,27 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.emf.ui.internal.dialogs;x-friends:="org.eclipse.papyrus.emf.facet.widgets.celleditors",
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.composite,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.widget.component.metaclass,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.wizard,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.wizard.page,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.wizard.page.exception,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.wizard,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.wizard.page,
- org.eclipse.papyrus.emf.facet.util.emf.ui.internal.utils,
- org.eclipse.papyrus.emf.facet.util.emf.ui.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.emf.common.ui;bundle-version="2.6.0",
- org.eclipse.emf.common;bundle-version="2.6.0",
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.emf.edit.ui;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.emf.ui.internal.dialogs;x-friends:="org.eclipse.papyrus.emf.facet.widgets.celleditors", + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.composite, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.widget.component.metaclass, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.wizard, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.wizard.page, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.util.wizard.page.exception, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.wizard, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.exported.wizard.page, + org.eclipse.papyrus.emf.facet.util.emf.ui.internal.utils, + org.eclipse.papyrus.emf.facet.util.emf.ui.util +Require-Bundle: org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)", + org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.swt;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.options b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.options index 88a4da0b230..3bca94841cb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.options +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.options @@ -7,5 +7,5 @@ # # Contributors: # Thomas Cicognani (Soft-Maint) - Bug 424416 - Plug-in for JFace Utilities -org.eclipse.papyrus.emf.facet.util.jface.ui.ui/debug=false -org.eclipse.papyrus.emf.facet.util.jface.ui.ui/debug/ImageProvider=false
\ No newline at end of file +org.eclipse.papyrus.emf.facet.util.jface.ui/debug=false +org.eclipse.papyrus.emf.facet.util.jface.ui/debug/ImageProvider=false
\ No newline at end of file diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.project index 760c59a1a09..e37abdfc292 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.project @@ -1,30 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.jface.ui</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>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.jface.ui</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF index 1061c1bbfb4..f4161248762 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF @@ -1,14 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.jface.ui.imageprovider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.jface;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.jface.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.jface.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.jface.ui.imageprovider +Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.swt;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.jface.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.jface.ui +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.project index 067c85ebfe0..3ce4c6a7db5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.project @@ -1,31 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.pde.core</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.pde.core</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF index 278c32e7d9f..ba75094e17c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF @@ -1,17 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported,
- org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported.exception
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.pde.core;bundle-version="3.6.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
- com.ibm.icu;bundle-version="4.2.1"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: EMF Facet PDE Core Utils
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.pde.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.pde.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported, + org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported.exception +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)", + com.ibm.icu;bundle-version="54.0.0" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: EMF Facet PDE Core Utils +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.pde.core.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.pde.core +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.project index f6f216db599..3d373b7a5af 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.project @@ -1,29 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.swt</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.swt</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.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF index cb2ba09e0ad..091c1b2d777 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF @@ -1,17 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.swt.colorprovider,
- org.eclipse.papyrus.emf.facet.util.swt.fontprovider,
- org.eclipse.papyrus.emf.facet.util.swt.imageprovider,
- org.eclipse.papyrus.emf.facet.util.swt.internal.exported
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.swt;bundle-version="3.6.0",
- org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.swt.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.swt;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.swt.colorprovider, + org.eclipse.papyrus.emf.facet.util.swt.fontprovider, + org.eclipse.papyrus.emf.facet.util.swt.imageprovider, + org.eclipse.papyrus.emf.facet.util.swt.internal.exported +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.swt.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.swt;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.project index 3fa919d7f12..9cd2e9aad5c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.project @@ -1,32 +1,45 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.util.ui</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>
- <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.util.ui</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF index f7c7d4855ed..961211dc12c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF @@ -1,40 +1,38 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.ui.internal.exported.composite,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.handler,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.tree.menu,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.composite,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.dialog,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.item,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.menu,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.getorcreate,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.bounds,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.name,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.query,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.wizard,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget.getorcreate,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.wizard,
- org.eclipse.papyrus.emf.facet.util.ui.utils
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.swt;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.ui.workbench;bundle-version="3.6.0",
- org.eclipse.jface;bundle-version="3.6.0",
- org.eclipse.emf.edit;bundle-version="2.6.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.util.ui.internal.exported.composite, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.handler, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.tree.menu, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.composite, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.dialog, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.item, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.menu, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.getorcreate, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.bounds, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.name, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.query, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.wizard, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget.getorcreate, + org.eclipse.papyrus.emf.facet.util.ui.internal.exported.wizard, + org.eclipse.papyrus.emf.facet.util.ui.utils +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)", + org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.util.ui.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.ui +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.project index a395a572cc2..0f4d11fb4bb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF index 6a9195b2633..9c6d33cd564 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF @@ -1,16 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore.composite
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore.composite +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.widgets.celleditors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.widgets;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.project index a97ed65a9e3..29c105a7aee 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.project @@ -1,30 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.widgets.celleditors</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.widgets.celleditors</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF index 12544e99b0f..e9a91e78be8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF @@ -1,37 +1,29 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.widgets.celleditors,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.core.composite.registries,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.internal;x-friends:="org.eclipse.papyrus.emf.facet.widgets.nattable",
- org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.composite.registries;x-internal:=true,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.core;x-friends:="org.eclipse.papyrus.emf.facet.widgets.nattable",
- org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.core.composite;x-internal:=true,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.core.composite.factories;x-internal:=true,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.ui;x-internal:=true,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.modelCellEditor,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.modelCellEditor.impl;x-internal:=true,
- org.eclipse.papyrus.emf.facet.widgets.celleditors.modelCellEditor.util;x-friends:="org.eclipse.papyrus.emf.facet.widgets.celleditors.edit"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.swt;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.widgets;bundle-version="1.2.0",
- org.eclipse.jface;bundle-version="3.6.0",
- org.eclipse.ui.workbench;bundle-version="3.6.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets.celleditors;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.widgets.celleditors, + org.eclipse.papyrus.emf.facet.widgets.celleditors.core.composite.registries, + org.eclipse.papyrus.emf.facet.widgets.celleditors.internal;x-friends:="org.eclipse.papyrus.emf.facet.widgets.nattable", + org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.composite.registries;x-internal:=true, + org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.core;x-friends:="org.eclipse.papyrus.emf.facet.widgets.nattable", + org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.core.composite;x-internal:=true, + org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.core.composite.factories;x-internal:=true, + org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.ui;x-internal:=true, + org.eclipse.papyrus.emf.facet.widgets.celleditors.modelCellEditor, + org.eclipse.papyrus.emf.facet.widgets.celleditors.modelCellEditor.impl;x-internal:=true, + org.eclipse.papyrus.emf.facet.widgets.celleditors.modelCellEditor.util;x-friends:="org.eclipse.papyrus.emf.facet.widgets.celleditors.edit" +Require-Bundle: org.eclipse.papyrus.emf.facet.widgets;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets.celleditors;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.project index d7b88bebdb8..ca5d617272a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.project +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.project @@ -1,30 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.emf.facet.widgets</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>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.emf.facet.widgets</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF index 7e40d942cbf..83c395ba637 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF @@ -1,19 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.widgets.internal;x-friends:="org.eclipse.papyrus.emf.facet.widgets.nattable,
- org.eclipse.papyrus.emf.facet.widgets.celleditors"
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.emf.edit.ui;bundle-version="2.6.0",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.emf.facet.widgets.internal;x-friends:="org.eclipse.papyrus.emf.facet.widgets.nattable, + org.eclipse.papyrus.emf.facet.widgets.celleditors" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)", + org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.project index bd6c5dc5bdd..98e1597521c 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.project +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF index 0f95843ca91..d88806cffec 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.edit;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.constraints.environment.provider, org.eclipse.papyrus.infra.constraints.provider Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin$Implementation diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml index f18670ccaec..8a0b9f7a565 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.constraints.edit</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.project index 7662e546de1..d4781a594ad 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.project +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF index a2229df65f3..ac90454c9b5 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.emf.edit.ui;visibility:=reexport, - org.eclipse.ui.ide +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.constraints.environment.presentation, org.eclipse.papyrus.infra.constraints.presentation Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin$Implementation diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml index a582793ef1f..3863373dc03 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.constraints.editor</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.project index 504fa7b2052..7a03413f3d1 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.project +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.project @@ -20,10 +20,34 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF index 9406211cf94..fffeb1ed57f 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF @@ -1,16 +1,13 @@ Manifest-Version: 1.0 -Export-Package: org.eclipse.papyrus.infra.constraints.internal.ui, +Export-Package: org.eclipse.papyrus.infra.constraints.internal.ui;x-internal:=true, org.eclipse.papyrus.infra.constraints.ui.providers Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui;bundle-version="3.100.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-Version: 1.2.0.qualifier Eclipse-BuddyPolicy: dependent diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.project index b25074f0f42..fe645f66b83 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.project +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.project @@ -20,10 +20,34 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF index 570db921afc..05ca7503202 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF @@ -12,13 +12,10 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0";visibility:=reexport +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Eclipse-BuddyPolicy: dependent Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator Bundle-ManifestVersion: 2 diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml index d0cbe425a31..f5aacd8499d 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.constraints</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java index c758dfd4a0f..60f8ec8aa1c 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java @@ -211,6 +211,8 @@ public abstract class AbstractConstraint implements Constraint { * * The default implementation matches a selection iff the constraint matches * each object of the selection. + * + * @since 2.0 */ @Override public boolean match(Collection<?> selection) { @@ -245,6 +247,9 @@ public abstract class AbstractConstraint implements Constraint { return false; } + /** + * @since 2.0 + */ protected Object first(Collection<?> collection) { return (collection instanceof List<?>) ? ((List<?>) collection).get(0) diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java index b6a96f7bc0b..85f7c20a2ec 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java @@ -44,6 +44,7 @@ public interface Constraint { * The selection to be tested against this constraint * @return * True if this constraint matches the given selection + * @since 2.0 */ public boolean match(Collection<?> selection); diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java index 0d93115d4d2..ef8ddef5e5f 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java @@ -39,6 +39,7 @@ public interface ConstraintEngine<E extends DisplayUnit> { * or just a single object * * @return the display units applicable to the selection + * @since 2.0 */ public Set<E> getDisplayUnits(Object selection); diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java index 63bae2ba467..2583b740814 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java @@ -58,6 +58,9 @@ public abstract class DefaultConstraintEngine<E extends DisplayUnit> implements private final Map<Class<?>, Method> collectionConverters = new HashMap<>(); + /** + * @since 2.0 + */ protected DefaultConstraintEngine(Class<? extends E> displayUnitType) { super(); @@ -75,6 +78,9 @@ public abstract class DefaultConstraintEngine<E extends DisplayUnit> implements } } + /** + * @since 2.0 + */ @Override public synchronized Set<E> getDisplayUnits(final Object selection) { Collection<?> collection = asCollection(selection); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project index ee0abe766e9..b427364eff8 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.log</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.log</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF index 8c2cc0d44e7..f52e6251e77 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime
-Export-Package: org.eclipse.papyrus.infra.core.log
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.core.log.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.core.log +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.core.log.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/LogHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/LogHelper.java index 9537346595c..333c0a4b5a1 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/LogHelper.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/LogHelper.java @@ -1,261 +1,263 @@ -/*******************************************************************************
- * Copyright (c) 2009, 2016 Atos Origin, CEA, Christian W. Damus, 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:
- * Atos Origin - initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- * Christian W. Damus - bugs 465416, 485220
- *
- *******************************************************************************/
-package org.eclipse.papyrus.infra.core.log;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * A Log Helper.
- *
- * @author tszadel
- *
- */
-public class LogHelper {
-
- /** The plugin Id. */
- private String pluginId;
-
- /** The plugin related to that helper. */
- private Bundle bundle;
-
- private boolean tracing;
- private Map<String, Boolean> traceOptions;
-
- /**
- * Default Constructor.
- * The associated plugin can be set later.
- * If no plugin is set, use java log.
- */
- public LogHelper() {
- }
-
- /**
- * Constructor.
- *
- * @param activator
- * The activator.
- */
- public LogHelper(Plugin activator) {
- setPlugin(activator);
- }
-
- /**
- * Constructor.
- *
- * @param bundle
- * The bundle.
- */
- public LogHelper(Bundle bundle) {
- setBundle(bundle);
- }
-
- /**
- * Set the associated plugin.
- * This plugin log will be used as log.
- *
- * @param activator
- */
- public void setPlugin(Plugin activator) {
- setBundle(activator.getBundle());
- }
-
- /**
- * Set the associated {@code bundle}.
- * This {@code bundle}'s log will be used as log.
- *
- * @param bundle
- * the bundle
- */
- public void setBundle(Bundle bundle) {
- this.pluginId = bundle.getSymbolicName();
- this.bundle = bundle;
-
- this.tracing = Boolean.valueOf(Platform.getDebugOption(String.format("%s/debug", pluginId))); //$NON-NLS-1$
- if (tracing) {
- this.traceOptions = new ConcurrentHashMap<String, Boolean>(32, 0.75f, 4);
- }
- }
-
- /**
- * Log an informative message into the Eclipse log file
- *
- * @param message
- * the message to log
- */
- public void info(String message) {
- log(message, IStatus.INFO);
- }
-
- /**
- * Log a debug message into the Eclipse log file
- *
- * @param message
- * the message to log
- */
- public void debug(String message) {
- if (isDebugEnabled()) {
- log("[DEBUG] " + message, IStatus.INFO);
- }
- }
-
- /**
- * Test if the platform is in debug mode.
- *
- * @return True if the platform is in debug mode.
- */
- public boolean isDebugEnabled() {
- if (bundle != null) {
- return Platform.inDebugMode();
- }
-
- return false;
- }
-
- /**
- * Queries whether the specified tracing {@code option} is enabled by the user.
- *
- * @param option
- * a tracing option, without the <tt>{@literal <bundle-id>/debug/}</tt> path prefix
- *
- * @return whether the tracing {@code option} is enabled
- *
- * @see #trace(String, String)
- */
- public boolean isTraceEnabled(String option) {
- if (tracing) {
- final String key = String.format("%s/debug/%s", pluginId, option); //$NON-NLS-1$
- Boolean result;
-
- synchronized (traceOptions) {
- result = traceOptions.get(key);
- if (result == null) {
- result = Boolean.valueOf(Platform.getDebugOption(key));
- traceOptions.put(key, result);
- }
- }
-
- return result;
- }
-
- return false;
- }
-
- /**
- * Prints the specified trace {@code message}, if the {@code option} is enabled by the user.
- *
- * @param option
- * the tracing option, without the <tt>{@literal <bundle-id>/debug/}</tt> path prefix
- * @param message
- * the message to print
- *
- * @see #isTraceEnabled(String)
- */
- public void trace(String option, String message) {
- if (isTraceEnabled(option)) {
- System.out.printf("[TRACE:%s] %s%n", option, message); //$NON-NLS-1$
- }
- }
-
- /**
- * Log a message with given level into the Eclipse log file
- *
- * @param message
- * the message to log
- * @param level
- * the message priority
- */
- private void log(String message, int level) {
- log(new Status(level, pluginId, message));
- }
-
- /**
- *
- * @param status
- */
- public void log(IStatus status) {
-
- if (bundle == null) {
- // TODO Do log with java ?
- } else {
- Platform.getLog(bundle).log(status);
- }
- }
-
- /**
- * Log a warning message.
- *
- * @param e
- * the exception to log
- */
- public void warn(String message) {
- log(message, IStatus.WARNING);
- }
-
-
- /**
- * Log an exception into the Eclipse log file
- *
- * @param e
- * the exception to log
- */
- public void error(Throwable e) {
- error("Unexpected Error", e);
- }
-
- /**
- * Log an exception into the Eclipse log file
- *
- * @param message
- * the message
- * @param e
- * the exception to log
- */
- public void error(String message, Throwable e) {
-
- Throwable t = e;
- if (e instanceof InvocationTargetException) {
- t = ((InvocationTargetException) e).getTargetException();
- }
-
- IStatus status;
- if (t instanceof CoreException) {
- status = ((CoreException) t).getStatus();
- } else {
- status = new Status(IStatus.ERROR, pluginId, message, e);
- }
-
- log(status);
- }
-
- /**
- * Obtains the stack-trace description of the caller of the calling method (that is, the method that
- * called the method using this helper method). Useful for logging warning messages etc.
- *
- * @return the caller of my caller, or a placeholder in case the JVM cannot provide the necessary
- * stack information (which is a documented possibility)
- */
- public String getCallerMethod() {
- StackTraceElement[] stack = new Exception().fillInStackTrace().getStackTrace();
- return ((stack == null) || (stack.length < 3)) ? "<unknown caller>" : stack[2].toString();
- }
-}
+/******************************************************************************* + * Copyright (c) 2009, 2016 Atos Origin, CEA, Christian W. Damus, 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: + * Atos Origin - initial API and implementation + * Christian W. Damus (CEA) - bug 422257 + * Christian W. Damus - bugs 465416, 485220 + * + *******************************************************************************/ +package org.eclipse.papyrus.infra.core.log; + +import java.lang.reflect.InvocationTargetException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Plugin; +import org.eclipse.core.runtime.Status; +import org.osgi.framework.Bundle; + +/** + * A Log Helper. + * + * @author tszadel + * + */ +public class LogHelper { + + /** The plugin Id. */ + private String pluginId; + + /** The plugin related to that helper. */ + private Bundle bundle; + + private boolean tracing; + private Map<String, Boolean> traceOptions; + + /** + * Default Constructor. + * The associated plugin can be set later. + * If no plugin is set, use java log. + */ + public LogHelper() { + } + + /** + * Constructor. + * + * @param activator + * The activator. + */ + public LogHelper(Plugin activator) { + setPlugin(activator); + } + + /** + * Constructor. + * + * @param bundle + * The bundle. + * @since 1.2 + */ + public LogHelper(Bundle bundle) { + setBundle(bundle); + } + + /** + * Set the associated plugin. + * This plugin log will be used as log. + * + * @param activator + */ + public void setPlugin(Plugin activator) { + setBundle(activator.getBundle()); + } + + /** + * Set the associated {@code bundle}. + * This {@code bundle}'s log will be used as log. + * + * @param bundle + * the bundle + * @since 1.2 + */ + public void setBundle(Bundle bundle) { + this.pluginId = bundle.getSymbolicName(); + this.bundle = bundle; + + this.tracing = Boolean.valueOf(Platform.getDebugOption(String.format("%s/debug", pluginId))); //$NON-NLS-1$ + if (tracing) { + this.traceOptions = new ConcurrentHashMap<String, Boolean>(32, 0.75f, 4); + } + } + + /** + * Log an informative message into the Eclipse log file + * + * @param message + * the message to log + */ + public void info(String message) { + log(message, IStatus.INFO); + } + + /** + * Log a debug message into the Eclipse log file + * + * @param message + * the message to log + */ + public void debug(String message) { + if (isDebugEnabled()) { + log("[DEBUG] " + message, IStatus.INFO); + } + } + + /** + * Test if the platform is in debug mode. + * + * @return True if the platform is in debug mode. + */ + public boolean isDebugEnabled() { + if (bundle != null) { + return Platform.inDebugMode(); + } + + return false; + } + + /** + * Queries whether the specified tracing {@code option} is enabled by the user. + * + * @param option + * a tracing option, without the <tt>{@literal <bundle-id>/debug/}</tt> path prefix + * + * @return whether the tracing {@code option} is enabled + * + * @see #trace(String, String) + */ + public boolean isTraceEnabled(String option) { + if (tracing) { + final String key = String.format("%s/debug/%s", pluginId, option); //$NON-NLS-1$ + Boolean result; + + synchronized (traceOptions) { + result = traceOptions.get(key); + if (result == null) { + result = Boolean.valueOf(Platform.getDebugOption(key)); + traceOptions.put(key, result); + } + } + + return result; + } + + return false; + } + + /** + * Prints the specified trace {@code message}, if the {@code option} is enabled by the user. + * + * @param option + * the tracing option, without the <tt>{@literal <bundle-id>/debug/}</tt> path prefix + * @param message + * the message to print + * + * @see #isTraceEnabled(String) + */ + public void trace(String option, String message) { + if (isTraceEnabled(option)) { + System.out.printf("[TRACE:%s] %s%n", option, message); //$NON-NLS-1$ + } + } + + /** + * Log a message with given level into the Eclipse log file + * + * @param message + * the message to log + * @param level + * the message priority + */ + private void log(String message, int level) { + log(new Status(level, pluginId, message)); + } + + /** + * + * @param status + */ + public void log(IStatus status) { + + if (bundle == null) { + // TODO Do log with java ? + } else { + Platform.getLog(bundle).log(status); + } + } + + /** + * Log a warning message. + * + * @param e + * the exception to log + */ + public void warn(String message) { + log(message, IStatus.WARNING); + } + + + /** + * Log an exception into the Eclipse log file + * + * @param e + * the exception to log + */ + public void error(Throwable e) { + error("Unexpected Error", e); + } + + /** + * Log an exception into the Eclipse log file + * + * @param message + * the message + * @param e + * the exception to log + */ + public void error(String message, Throwable e) { + + Throwable t = e; + if (e instanceof InvocationTargetException) { + t = ((InvocationTargetException) e).getTargetException(); + } + + IStatus status; + if (t instanceof CoreException) { + status = ((CoreException) t).getStatus(); + } else { + status = new Status(IStatus.ERROR, pluginId, message, e); + } + + log(status); + } + + /** + * Obtains the stack-trace description of the caller of the calling method (that is, the method that + * called the method using this helper method). Useful for logging warning messages etc. + * + * @return the caller of my caller, or a placeholder in case the JVM cannot provide the necessary + * stack information (which is a documented possibility) + */ + public String getCallerMethod() { + StackTraceElement[] stack = new Exception().fillInStackTrace().getStackTrace(); + return ((stack == null) || (stack.length < 3)) ? "<unknown caller>" : stack[2].toString(); + } +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/.project index 935d5ed70f1..4a8749d1e78 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/.project +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.pluginexplorer</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.pluginexplorer</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF index e91b815a11c..90913434d2f 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF @@ -1,15 +1,14 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.core.pluginexplorer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.core.pluginexplorer.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.pluginexplorer;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.core.pluginexplorer +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.infra.core.pluginexplorer.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.pluginexplorer;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project index 46189987209..e0e931c07d1 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.sasheditor.di</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.sasheditor.di</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF index 3d881990d21..f0fdd97593a 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF @@ -1,27 +1,20 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands,
- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,
- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.swt;bundle-version="3.5.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.5.0";visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.common;visibility:=reexport,
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di;singleton:=true
-Eclipse-ExtensibleAPI: true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider, + org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands, + org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;x-internal:=true, + org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-Version: 2.0.0.qualifier +Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di;singleton:=true +Eclipse-ExtensibleAPI: true diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java index 2d242f0b080..a06bc084fdf 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelManager.java @@ -1,333 +1,335 @@ -/*****************************************************************************
- * Copyright (c) 2013, 2016 Cedric Dumoulin, Christian W. Damus, 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus - bugs 469188, 485220
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.CurrentFolderAndPageManager;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ICurrentFolderAndPageMngr;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalDiContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalPageManagerImpl;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-
-
-/**
- * Class used as main entry point to access a sash model build on EMF / di
- * This class allows to get facade objects on the diSashModel.
- *
- * @author cedric dumoulin
- *
- */
-public class DiSashModelManager {
-
- /** The EMF model used to store the sash windows structure and pages */
- protected SashWindowsMngr sashWindowMngr;
-
- /**
- * Instance of the {@link PageManagerImpl}.
- */
- private final PageManagerImpl pageMngr;
-
- /**
- * Instance of the DiContentProvider used to manipulate SashModel.
- */
- private final DiContentProvider contentProvider;
-
- private final TransactionalDiContentProvider transDiContentProvider;
-
- private final IPageModelFactory pageModelFactory;
-
- /**
- * Object used externally listen to model changes.
- * The object is also used internally to control how events are fired (limit multiple events).
- */
- protected ContentChangedEventProvider contentChangedEventProvider;
-
- /** The factory used to create IPageModel */
- // private IPageModelFactory pageModelFactory;
-
-
- /**
- *
- * Constructor.
- *
- * @param pageModelFactory
- * @param diResource
- * @param currentFolderAndPageMngr
- */
- public DiSashModelManager(IPageModelFactory pageModelFactory, final Resource diResource, TransactionalEditingDomain editingDomain, ICurrentFolderAndPageMngr currentFolderAndPageMngr) {
- // this.pageModelFactory = pageModelFactory;
-
- // lookup the SashModel
- sashWindowMngr = lookupSashWindowMngr(diResource);
- // If no SashWindow structure is found, create a new one using a transaction.
- if (sashWindowMngr == null) {
- // Create a default model and attach it to resource.
- sashWindowMngr = createDefaultSashModel();
- // Create a command
- RecordingCommand cmd = new RecordingCommand(editingDomain) {
-
- @Override
- protected void doExecute() {
- diResource.getContents().add(sashWindowMngr);
- }
- };
- // Execute command
- editingDomain.getCommandStack().execute(cmd);
- }
-
- this.pageModelFactory = pageModelFactory;
-
- contentProvider = new DiContentProvider(sashWindowMngr.getSashModel(), pageModelFactory, contentChangedEventProvider);
- // Create the TransactionalDiContentProvider
- transDiContentProvider = new TransactionalDiContentProvider(getDiContentProvider(), editingDomain);
-
- // Create the TransactionalPageMngrImpl
- pageMngr = new TransactionalPageManagerImpl(sashWindowMngr, contentChangedEventProvider, currentFolderAndPageMngr);
- }
-
- /**
- *
- * Constructor.
- *
- * @param pageModelFactory
- * @param diResource
- * @param currentFolderAndPageMngr
- */
- public DiSashModelManager(IPageModelFactory pageModelFactory, final Resource diResource, TransactionalEditingDomain editingDomain) {
-
- // lookup the SashModel
- sashWindowMngr = lookupSashWindowMngr(diResource);
- // If no SashWindow structure is found, create a new one using a transaction.
- if (sashWindowMngr == null) {
- // Create a default model and attach it to resource.
- sashWindowMngr = createDefaultSashModel();
-
- try {
- TransactionHelper.run(editingDomain, new Runnable() {
-
- @Override
- public void run() {
- diResource.getContents().add(sashWindowMngr);
-
- };
- });
- } catch (Exception ex) {
- Activator.log.error(ex);
- }
- }
-
- this.pageModelFactory = pageModelFactory;
-
- contentProvider = new DiContentProvider(sashWindowMngr.getSashModel(), pageModelFactory, getContentChangedEventProvider());
- // Create the TransactionalDiContentProvider
- transDiContentProvider = new TransactionalDiContentProvider(getDiContentProvider(), editingDomain);
-
- // Create the TransactionalPageMngrImpl
- pageMngr = new TransactionalPageManagerImpl(sashWindowMngr, getContentChangedEventProvider());
-
- }
-
- /**
- *
- * @param currentFolderAndPageMngr
- */
- public void setCurrentFolderAndPageMngr(ICurrentFolderAndPageMngr currentFolderAndPageMngr) {
- pageMngr.setCurrentFolderAndPageMngr(currentFolderAndPageMngr);
- }
-
- /**
- * Set the CurrentFolderAndPageManager as an instance of {@link CurrentFolderAndPageManager}
- *
- * @param currentFolderAndPageMngr
- */
- public void setCurrentFolderAndPageMngr(ISashWindowsContainer sashWindowsContainer) {
- pageMngr.setCurrentFolderAndPageMngr(new CurrentFolderAndPageManager(sashWindowsContainer));
- }
-
- /**
- *
- * Constructor.
- * Only create a {@link IPageMngr} impl. Do not create the DiContentProvider as there is no factory provided.
- * Internal use.
- *
- * @param pageModelFactory
- * @param diResource
- */
- // private DiSashModelManager(final Resource diResource, TransactionalEditingDomain editingDomain, ICurrentFolderAndPageMngr currentFolderAndPageMngr) {
- // this(null, diResource, editingDomain, currentFolderAndPageMngr);
- //
- // }
-
-
- /**
- * Get the internal EMF implementation.
- * Intended to be used by tests.
- *
- * @return the sashWindowMngr
- */
- protected SashWindowsMngr getDiSashWindowsMngr() {
- return sashWindowMngr;
- }
-
-
- /**
- * Return the internal implementation of ContentProvider.
- * Create if if needed.
- * This method should not be subclassed
- *
- * @return the contentProvider
- */
- protected DiContentProvider getDiContentProvider() {
- return contentProvider;
- }
-
- /**
- * Return the internal implementation of ContentProvider.
- * Create if if needed.
- * This method should not be subclassed
- *
- * @return the contentProvider
- */
- protected TransactionalDiContentProvider getTransactionalDiContentProvider() {
- return transDiContentProvider;
- }
-
- /**
- * Return the internal implementation of PageMngr.
- * Create if if needed.
- * This method should not be subclassed
- *
- * @return the PageMngrImpl
- */
- protected final PageManagerImpl getPageManagerImpl() {
- return pageMngr;
- }
-
- /**
- * Return the internal implementation of ContentChangedEventProvider.
- * Create if if needed.
- * This method should not be subclassed
- *
- * @return the PageMngrImpl
- */
- protected final ContentChangedEventProvider getContentChangedEventProvider() {
- if (contentChangedEventProvider == null) {
- contentChangedEventProvider = new ContentChangedEventProvider(sashWindowMngr);
- }
-
- return contentChangedEventProvider;
- }
-
- /**
- * Get the IPageManager providing basic methods to manage Pages in the sash model.
- *
- * @return
- */
- public IPageManager getIPageManager() {
- return getPageManagerImpl();
- }
-
- /**
- * Get the ContentProvider used by the SashWindows system.
- * This class can also be used to accurately manage the sash model.
- *
- * @return
- */
- public ISashWindowsContentProvider getISashWindowsContentProvider() {
-
- return getTransactionalDiContentProvider();
-
- }
-
- /**
- * Get the ContentChangedProvider for the SashModel
- *
- * @return
- */
- public IContentChangedProvider getSashModelContentChangedProvider() {
- return getContentChangedEventProvider();
- }
-
- /**
- * Create a default model with one window and one folder.
- *
- * @param diResource
- * @return
- */
- protected SashWindowsMngr createDefaultSashModel() {
- SashWindowsMngr result = DiUtils.createDefaultSashWindowsMngr();
-
- if (result.getSashModel() != null) {
- // Default this to true for new models, which store the sash model
- // in the workspace private area by default
- result.getSashModel().setRestoreActivePage(true);
- }
-
- return result;
- }
-
- /**
- * Lookup for the SashModel object in the resource
- *
- * @param diResource
- * @return
- */
- protected SashWindowsMngr lookupSashWindowMngr(Resource diResource) {
-
- return DiUtils.lookupSashWindowsMngr(diResource);
- }
-
- /*
- * Create an instance of IPageMngr acting on the provided resource.
- * This instance is suitable to add, remove, close or open diagrams.
- *
- * @param diResource
- *
- * @return The non transactional version of the IPageMngr
- */
- // public static IPageMngr createIPageMngr(Resource diResource) {
- //
- // // Create an instance of the DiSashModelMngr with no factory.
- // // The factory is not needed since we don't get the ISashWindowsContentProvider.
- // return new DiSashModelManager(null, diResource).getIPageMngr();
- //
- // }
-
- /**
- * Finds a the EditorIDs that can open the given pageIdentifier
- *
- * @param pageIdentifier
- * @return A map of (ID -> Label) for the matching editors
- *
- * @see {@link IPageManager#DEFAULT_EDITOR}
- */
- public Map<String, String> getEditorIDsFor(Object pageIdentifier) {
- return pageModelFactory.getEditorIDsFor(pageIdentifier);
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2013, 2016 Cedric Dumoulin, Christian W. Damus, 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: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus - bugs 469188, 485220 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider; + +import java.util.Map; + +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.transaction.RecordingCommand; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.CurrentFolderAndPageManager; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ICurrentFolderAndPageMngr; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalDiContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalPageManagerImpl; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper; +import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; +import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils; + + +/** + * Class used as main entry point to access a sash model build on EMF / di + * This class allows to get facade objects on the diSashModel. + * + * @author cedric dumoulin + * + */ +public class DiSashModelManager { + + /** The EMF model used to store the sash windows structure and pages */ + protected SashWindowsMngr sashWindowMngr; + + /** + * Instance of the {@link PageManagerImpl}. + */ + private final PageManagerImpl pageMngr; + + /** + * Instance of the DiContentProvider used to manipulate SashModel. + */ + private final DiContentProvider contentProvider; + + private final TransactionalDiContentProvider transDiContentProvider; + + private final IPageModelFactory pageModelFactory; + + /** + * Object used externally listen to model changes. + * The object is also used internally to control how events are fired (limit multiple events). + */ + protected ContentChangedEventProvider contentChangedEventProvider; + + /** The factory used to create IPageModel */ + // private IPageModelFactory pageModelFactory; + + + /** + * + * Constructor. + * + * @param pageModelFactory + * @param diResource + * @param currentFolderAndPageMngr + */ + public DiSashModelManager(IPageModelFactory pageModelFactory, final Resource diResource, TransactionalEditingDomain editingDomain, ICurrentFolderAndPageMngr currentFolderAndPageMngr) { + // this.pageModelFactory = pageModelFactory; + + // lookup the SashModel + sashWindowMngr = lookupSashWindowMngr(diResource); + // If no SashWindow structure is found, create a new one using a transaction. + if (sashWindowMngr == null) { + // Create a default model and attach it to resource. + sashWindowMngr = createDefaultSashModel(); + // Create a command + RecordingCommand cmd = new RecordingCommand(editingDomain) { + + @Override + protected void doExecute() { + diResource.getContents().add(sashWindowMngr); + } + }; + // Execute command + editingDomain.getCommandStack().execute(cmd); + } + + this.pageModelFactory = pageModelFactory; + + contentProvider = new DiContentProvider(sashWindowMngr.getSashModel(), pageModelFactory, contentChangedEventProvider); + // Create the TransactionalDiContentProvider + transDiContentProvider = new TransactionalDiContentProvider(getDiContentProvider(), editingDomain); + + // Create the TransactionalPageMngrImpl + pageMngr = new TransactionalPageManagerImpl(sashWindowMngr, contentChangedEventProvider, currentFolderAndPageMngr); + } + + /** + * + * Constructor. + * + * @param pageModelFactory + * @param diResource + * @param currentFolderAndPageMngr + */ + public DiSashModelManager(IPageModelFactory pageModelFactory, final Resource diResource, TransactionalEditingDomain editingDomain) { + + // lookup the SashModel + sashWindowMngr = lookupSashWindowMngr(diResource); + // If no SashWindow structure is found, create a new one using a transaction. + if (sashWindowMngr == null) { + // Create a default model and attach it to resource. + sashWindowMngr = createDefaultSashModel(); + + try { + TransactionHelper.run(editingDomain, new Runnable() { + + @Override + public void run() { + diResource.getContents().add(sashWindowMngr); + + }; + }); + } catch (Exception ex) { + Activator.log.error(ex); + } + } + + this.pageModelFactory = pageModelFactory; + + contentProvider = new DiContentProvider(sashWindowMngr.getSashModel(), pageModelFactory, getContentChangedEventProvider()); + // Create the TransactionalDiContentProvider + transDiContentProvider = new TransactionalDiContentProvider(getDiContentProvider(), editingDomain); + + // Create the TransactionalPageMngrImpl + pageMngr = new TransactionalPageManagerImpl(sashWindowMngr, getContentChangedEventProvider()); + + } + + /** + * + * @param currentFolderAndPageMngr + */ + public void setCurrentFolderAndPageMngr(ICurrentFolderAndPageMngr currentFolderAndPageMngr) { + pageMngr.setCurrentFolderAndPageMngr(currentFolderAndPageMngr); + } + + /** + * Set the CurrentFolderAndPageManager as an instance of {@link CurrentFolderAndPageManager} + * + * @param currentFolderAndPageMngr + */ + public void setCurrentFolderAndPageMngr(ISashWindowsContainer sashWindowsContainer) { + pageMngr.setCurrentFolderAndPageMngr(new CurrentFolderAndPageManager(sashWindowsContainer)); + } + + /** + * + * Constructor. + * Only create a {@link IPageMngr} impl. Do not create the DiContentProvider as there is no factory provided. + * Internal use. + * + * @param pageModelFactory + * @param diResource + */ + // private DiSashModelManager(final Resource diResource, TransactionalEditingDomain editingDomain, ICurrentFolderAndPageMngr currentFolderAndPageMngr) { + // this(null, diResource, editingDomain, currentFolderAndPageMngr); + // + // } + + + /** + * Get the internal EMF implementation. + * Intended to be used by tests. + * + * @return the sashWindowMngr + */ + protected SashWindowsMngr getDiSashWindowsMngr() { + return sashWindowMngr; + } + + + /** + * Return the internal implementation of ContentProvider. + * Create if if needed. + * This method should not be subclassed + * + * @return the contentProvider + */ + protected DiContentProvider getDiContentProvider() { + return contentProvider; + } + + /** + * Return the internal implementation of ContentProvider. + * Create if if needed. + * This method should not be subclassed + * + * @return the contentProvider + */ + protected TransactionalDiContentProvider getTransactionalDiContentProvider() { + return transDiContentProvider; + } + + /** + * Return the internal implementation of PageMngr. + * Create if if needed. + * This method should not be subclassed + * + * @return the PageMngrImpl + */ + protected final PageManagerImpl getPageManagerImpl() { + return pageMngr; + } + + /** + * Return the internal implementation of ContentChangedEventProvider. + * Create if if needed. + * This method should not be subclassed + * + * @return the PageMngrImpl + */ + protected final ContentChangedEventProvider getContentChangedEventProvider() { + if (contentChangedEventProvider == null) { + contentChangedEventProvider = new ContentChangedEventProvider(sashWindowMngr); + } + + return contentChangedEventProvider; + } + + /** + * Get the IPageManager providing basic methods to manage Pages in the sash model. + * + * @return + * @since 2.0 + */ + public IPageManager getIPageManager() { + return getPageManagerImpl(); + } + + /** + * Get the ContentProvider used by the SashWindows system. + * This class can also be used to accurately manage the sash model. + * + * @return + */ + public ISashWindowsContentProvider getISashWindowsContentProvider() { + + return getTransactionalDiContentProvider(); + + } + + /** + * Get the ContentChangedProvider for the SashModel + * + * @return + */ + public IContentChangedProvider getSashModelContentChangedProvider() { + return getContentChangedEventProvider(); + } + + /** + * Create a default model with one window and one folder. + * + * @param diResource + * @return + */ + protected SashWindowsMngr createDefaultSashModel() { + SashWindowsMngr result = DiUtils.createDefaultSashWindowsMngr(); + + if (result.getSashModel() != null) { + // Default this to true for new models, which store the sash model + // in the workspace private area by default + result.getSashModel().setRestoreActivePage(true); + } + + return result; + } + + /** + * Lookup for the SashModel object in the resource + * + * @param diResource + * @return + */ + protected SashWindowsMngr lookupSashWindowMngr(Resource diResource) { + + return DiUtils.lookupSashWindowsMngr(diResource); + } + + /* + * Create an instance of IPageMngr acting on the provided resource. + * This instance is suitable to add, remove, close or open diagrams. + * + * @param diResource + * + * @return The non transactional version of the IPageMngr + */ + // public static IPageMngr createIPageMngr(Resource diResource) { + // + // // Create an instance of the DiSashModelMngr with no factory. + // // The factory is not needed since we don't get the ISashWindowsContentProvider. + // return new DiSashModelManager(null, diResource).getIPageMngr(); + // + // } + + /** + * Finds a the EditorIDs that can open the given pageIdentifier + * + * @param pageIdentifier + * @return A map of (ID -> Label) for the matching editors + * + * @see {@link IPageManager#DEFAULT_EDITOR} + * @since 2.0 + */ + public Map<String, String> getEditorIDsFor(Object pageIdentifier) { + return pageModelFactory.getEditorIDsFor(pageIdentifier); + } + +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java index 75a65785394..ab174d6f9cc 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/DiSashModelMngr.java @@ -1,251 +1,253 @@ -/*****************************************************************************
- * Copyright (c) 2009, 2015 CEA LIST & LIFL, Christian W. Damus, 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus - bug 469188
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalPageManagerImpl;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-
-
-/**
- * Class used as main entry point to access a sash model build on EMF / di
- *
- * @author cedric dumoulin
- */
-public class DiSashModelMngr {
-
- /** The EMF model used to store the sash windows structure and pages */
- protected SashWindowsMngr sashWindowMngr;
-
- /**
- * Instance of the pageMngr.
- */
- private PageManagerImpl pageMngr = null;
-
- /**
- * Instance of the DiContentProvider used to manipulate SashModel.
- */
- private DiContentProvider contentProvider;
-
- /**
- * Object used externally listen to model changes.
- * The object is also used internally to control how events are fired (limit multiple events).
- */
- protected ContentChangedEventProvider contentChangedEventProvider;
-
- /** The factory used to create IPageModel */
- private IPageModelFactory pageModelFactory;
-
-
- /**
- * Constructor.
- * Create a DiSashModelMngr with the specified factory. A SashModel is created but not attached to a resource.
- * This constructor is for subclasses. The subclasses should initialize the sashWindowMngr
- *
- * @param pageModelFactory
- * @param createDefaultSashModel
- * If true, create the default SashModel by calling {@link #createDefaultSashModel()}
- */
- protected DiSashModelMngr(IPageModelFactory pageModelFactory, boolean createDefaultSashModel) {
- this.pageModelFactory = pageModelFactory;
- // Create a SashModel
- if (createDefaultSashModel) {
- sashWindowMngr = createDefaultSashModel();
- }
- }
-
- /**
- * Constructor.
- * Create a DiSashModelMngr with the specified factory. A SashModel is created but not attached to a resource.
- *
- * @param pageModelFactory
- */
- public DiSashModelMngr(IPageModelFactory pageModelFactory) {
- this.pageModelFactory = pageModelFactory;
- // Create a SashModel
- sashWindowMngr = createDefaultSashModel();
- }
-
- /**
- * Constructor.
- * Create a DiSashModelMngr with the specified factory. The SashModel is searched in the Resource. If not found,
- * create one in the resource.
- *
- * @param pageModelFactory
- * @param diResource
- */
- public DiSashModelMngr(IPageModelFactory pageModelFactory, Resource diResource) {
- this.pageModelFactory = pageModelFactory;
-
- // lookup the SashModel
- sashWindowMngr = lookupSashWindowMngr(diResource);
- if (sashWindowMngr == null) {
- // Create a default model and attach it to resource.
- sashWindowMngr = createDefaultSashModel();
- diResource.getContents().add(sashWindowMngr);
- }
- }
-
- /**
- * Constructor.
- * Create a DiSashModelMngr with the specified factory and sashModel.
- *
- * @param pageModelFactory
- * @param sashModel
- */
- public DiSashModelMngr(IPageModelFactory pageModelFactory, SashWindowsMngr sashModel) {
- this.pageModelFactory = pageModelFactory;
- this.sashWindowMngr = sashModel;
- }
-
- /**
- * Get the internal EMF implementation.
- * Intended to be used by tests.
- *
- * @return the sashWindowMngr
- */
- protected SashWindowsMngr getDiSashWindowsMngr() {
- return sashWindowMngr;
- }
-
-
- /**
- * Return the internal implementation of ContentProvider.
- * Create if if needed.
- * This method should not be subclassed
- *
- * @return the contentProvider
- */
- protected final DiContentProvider getDiContentProvider() {
- if (contentProvider == null) {
- contentProvider = new DiContentProvider(sashWindowMngr.getSashModel(), pageModelFactory, getContentChangedEventProvider());
- }
- return contentProvider;
- }
-
- /**
- * Return the internal implementation of PageMngr.
- * Create if if needed.
- * This method should not be subclassed
- *
- * @return the PageMngrImpl
- */
- protected final PageManagerImpl getPageMngrImpl() {
- if (pageMngr == null) {
- pageMngr = new TransactionalPageManagerImpl(sashWindowMngr, getContentChangedEventProvider());
- }
-
- return pageMngr;
- }
-
- /**
- * Return the internal implementation of ContentChangedEventProvider.
- * Create if if needed.
- * This method should not be subclassed
- *
- * @return the PageMngrImpl
- */
- protected final ContentChangedEventProvider getContentChangedEventProvider() {
- if (contentChangedEventProvider == null) {
- contentChangedEventProvider = new ContentChangedEventProvider(sashWindowMngr);
- }
-
- return contentChangedEventProvider;
- }
-
- /**
- * Get the IPageMngr providing basic methods to manage Pages in the sash model.
- *
- * @return
- */
- public IPageManager getIPageMngr() {
- return getPageMngrImpl();
- }
-
- /**
- * Get the ContentProvider used by the SashWindows system.
- * This class can also be used to accurately manage the sash model.
- *
- * @return
- */
- public ISashWindowsContentProvider getISashWindowsContentProvider() {
-
- return getDiContentProvider();
-
- }
-
- /**
- * Get the ContentChangedProvider for the SashModel
- *
- * @return
- */
- public IContentChangedProvider getSashModelContentChangedProvider() {
- return getContentChangedEventProvider();
- }
-
- /**
- * Create a default model with one window and one folder.
- *
- * @param diResource
- * @return
- */
- protected SashWindowsMngr createDefaultSashModel() {
- SashWindowsMngr result = DiUtils.createDefaultSashWindowsMngr();
-
- if (result.getSashModel() != null) {
- // Default this to true for new models, which store the sash model
- // in the workspace private area by default
- result.getSashModel().setRestoreActivePage(true);
- }
-
- return result;
- }
-
- /**
- * Lookup for the SashModel object in the resource
- *
- * @param diResource
- * @return
- */
- protected SashWindowsMngr lookupSashWindowMngr(Resource diResource) {
-
- return DiUtils.lookupSashWindowsMngr(diResource);
- }
-
- /**
- * Create an instance of IPageMngr acting on the provided resource.
- * This instance is suitable to add, remove, close or open diagrams.
- *
- * @param diResource
- * @return The non transactional version of the IPageMngr
- */
- public static IPageManager createIPageMngr(Resource diResource) {
-
- // Create an instance of the DiSashModelMngr with no factory.
- // The factory is not needed since we don't get the ISashWindowsContentProvider.
- return new DiSashModelMngr(null, diResource).getIPageMngr();
-
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2009, 2015 CEA LIST & LIFL, Christian W. Damus, 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: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus - bug 469188 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider; + +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ContentChangedEventProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.DiContentProvider; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalPageManagerImpl; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; +import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils; + + +/** + * Class used as main entry point to access a sash model build on EMF / di + * + * @author cedric dumoulin + */ +public class DiSashModelMngr { + + /** The EMF model used to store the sash windows structure and pages */ + protected SashWindowsMngr sashWindowMngr; + + /** + * Instance of the pageMngr. + */ + private PageManagerImpl pageMngr = null; + + /** + * Instance of the DiContentProvider used to manipulate SashModel. + */ + private DiContentProvider contentProvider; + + /** + * Object used externally listen to model changes. + * The object is also used internally to control how events are fired (limit multiple events). + */ + protected ContentChangedEventProvider contentChangedEventProvider; + + /** The factory used to create IPageModel */ + private IPageModelFactory pageModelFactory; + + + /** + * Constructor. + * Create a DiSashModelMngr with the specified factory. A SashModel is created but not attached to a resource. + * This constructor is for subclasses. The subclasses should initialize the sashWindowMngr + * + * @param pageModelFactory + * @param createDefaultSashModel + * If true, create the default SashModel by calling {@link #createDefaultSashModel()} + */ + protected DiSashModelMngr(IPageModelFactory pageModelFactory, boolean createDefaultSashModel) { + this.pageModelFactory = pageModelFactory; + // Create a SashModel + if (createDefaultSashModel) { + sashWindowMngr = createDefaultSashModel(); + } + } + + /** + * Constructor. + * Create a DiSashModelMngr with the specified factory. A SashModel is created but not attached to a resource. + * + * @param pageModelFactory + */ + public DiSashModelMngr(IPageModelFactory pageModelFactory) { + this.pageModelFactory = pageModelFactory; + // Create a SashModel + sashWindowMngr = createDefaultSashModel(); + } + + /** + * Constructor. + * Create a DiSashModelMngr with the specified factory. The SashModel is searched in the Resource. If not found, + * create one in the resource. + * + * @param pageModelFactory + * @param diResource + */ + public DiSashModelMngr(IPageModelFactory pageModelFactory, Resource diResource) { + this.pageModelFactory = pageModelFactory; + + // lookup the SashModel + sashWindowMngr = lookupSashWindowMngr(diResource); + if (sashWindowMngr == null) { + // Create a default model and attach it to resource. + sashWindowMngr = createDefaultSashModel(); + diResource.getContents().add(sashWindowMngr); + } + } + + /** + * Constructor. + * Create a DiSashModelMngr with the specified factory and sashModel. + * + * @param pageModelFactory + * @param sashModel + */ + public DiSashModelMngr(IPageModelFactory pageModelFactory, SashWindowsMngr sashModel) { + this.pageModelFactory = pageModelFactory; + this.sashWindowMngr = sashModel; + } + + /** + * Get the internal EMF implementation. + * Intended to be used by tests. + * + * @return the sashWindowMngr + */ + protected SashWindowsMngr getDiSashWindowsMngr() { + return sashWindowMngr; + } + + + /** + * Return the internal implementation of ContentProvider. + * Create if if needed. + * This method should not be subclassed + * + * @return the contentProvider + */ + protected final DiContentProvider getDiContentProvider() { + if (contentProvider == null) { + contentProvider = new DiContentProvider(sashWindowMngr.getSashModel(), pageModelFactory, getContentChangedEventProvider()); + } + return contentProvider; + } + + /** + * Return the internal implementation of PageMngr. + * Create if if needed. + * This method should not be subclassed + * + * @return the PageMngrImpl + */ + protected final PageManagerImpl getPageMngrImpl() { + if (pageMngr == null) { + pageMngr = new TransactionalPageManagerImpl(sashWindowMngr, getContentChangedEventProvider()); + } + + return pageMngr; + } + + /** + * Return the internal implementation of ContentChangedEventProvider. + * Create if if needed. + * This method should not be subclassed + * + * @return the PageMngrImpl + */ + protected final ContentChangedEventProvider getContentChangedEventProvider() { + if (contentChangedEventProvider == null) { + contentChangedEventProvider = new ContentChangedEventProvider(sashWindowMngr); + } + + return contentChangedEventProvider; + } + + /** + * Get the IPageMngr providing basic methods to manage Pages in the sash model. + * + * @return + * @since 2.0 + */ + public IPageManager getIPageMngr() { + return getPageMngrImpl(); + } + + /** + * Get the ContentProvider used by the SashWindows system. + * This class can also be used to accurately manage the sash model. + * + * @return + */ + public ISashWindowsContentProvider getISashWindowsContentProvider() { + + return getDiContentProvider(); + + } + + /** + * Get the ContentChangedProvider for the SashModel + * + * @return + */ + public IContentChangedProvider getSashModelContentChangedProvider() { + return getContentChangedEventProvider(); + } + + /** + * Create a default model with one window and one folder. + * + * @param diResource + * @return + */ + protected SashWindowsMngr createDefaultSashModel() { + SashWindowsMngr result = DiUtils.createDefaultSashWindowsMngr(); + + if (result.getSashModel() != null) { + // Default this to true for new models, which store the sash model + // in the workspace private area by default + result.getSashModel().setRestoreActivePage(true); + } + + return result; + } + + /** + * Lookup for the SashModel object in the resource + * + * @param diResource + * @return + */ + protected SashWindowsMngr lookupSashWindowMngr(Resource diResource) { + + return DiUtils.lookupSashWindowsMngr(diResource); + } + + /** + * Create an instance of IPageMngr acting on the provided resource. + * This instance is suitable to add, remove, close or open diagrams. + * + * @param diResource + * @return The non transactional version of the IPageMngr + * @since 2.0 + */ + public static IPageManager createIPageMngr(Resource diResource) { + + // Create an instance of the DiSashModelMngr with no factory. + // The factory is not needed since we don't get the ISashWindowsContentProvider. + return new DiSashModelMngr(null, diResource).getIPageMngr(); + + } + + +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java index c9a5991f9e7..eed593316ca 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IPageModelFactory.java @@ -1,76 +1,80 @@ -/*****************************************************************************
- * Copyright (c) 2009 - 2015 CEA LIST & LIFL
- *
- * 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Camille Letavernier (CEA LIST) - camille.letavernier@cea.fr - Bug 476625
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-
-
-/**
- * Factory used to create IPageModel from an object identifying a page.
- * IPageModel are objects used by the Sash Windows to create a page.
- *
- * @author cedric dumoulin
- */
-public interface IPageModelFactory {
-
- /**
- * Generic EditorID that represents the default editor associated to any page identifier
- */
- String DEFAULT_EDITOR = IPageManager.class.getCanonicalName() + ".Default";
-
- /**
- * Create the IPageModel for the pageIdentifier. The pageIdentifier is the object passed to
- * the {@link IPageManager#addEditor(EObject)}.
- * This factory method is called by the Sash Windows whenever it needs to create a page. The identifier
- * is found in the sash model.
- *
- * @param pageIdentifier
- * The identifier identifying the page to create.
- * @return
- */
- public IPageModel createIPageModel(Object pageIdentifier);
-
- /**
- * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(java.lang.Object)
- *
- * @param pageIdentifier
- * @return
- */
- default IPageModel createIPageModel(Object pageIdentifier, String favoriteEditorID) {
- return createIPageModel(pageIdentifier);
- }
-
- /**
- * Finds the EditorIDs that can open the given pageIdentifier. This list is a hint
- *
- * The exact behavior is implementation-specific; this method shouldn't be used
- * to determine whether a page identifier can actually be opened.
- *
- * Implementations may return a list containing the {@link IPageManager#DEFAULT_EDITOR} ID,
- * and the list might be incomplete (i.e. editors not listed might
- * still be able to open the given pageIdentifier)
- *
- * @param pageIdentifier
- * @return A map of (ID -> Label) of the editors that can open the given page
- *
- * @see {@link IPageManager#DEFAULT_EDITOR}
- */
- default Map<String, String> getEditorIDsFor(Object pageIdentifier) {
- return Collections.singletonMap(DEFAULT_EDITOR, "Default editor");
- }
-}
+/***************************************************************************** + * Copyright (c) 2009 - 2015 CEA LIST & LIFL + * + * 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: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Camille Letavernier (CEA LIST) - camille.letavernier@cea.fr - Bug 476625 + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider; + +import java.util.Collections; +import java.util.Map; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; + + +/** + * Factory used to create IPageModel from an object identifying a page. + * IPageModel are objects used by the Sash Windows to create a page. + * + * @author cedric dumoulin + */ +public interface IPageModelFactory { + + /** + * Generic EditorID that represents the default editor associated to any page identifier + * + * @since 2.0 + */ + String DEFAULT_EDITOR = IPageManager.class.getCanonicalName() + ".Default"; + + /** + * Create the IPageModel for the pageIdentifier. The pageIdentifier is the object passed to + * the {@link IPageManager#addEditor(EObject)}. + * This factory method is called by the Sash Windows whenever it needs to create a page. The identifier + * is found in the sash model. + * + * @param pageIdentifier + * The identifier identifying the page to create. + * @return + */ + public IPageModel createIPageModel(Object pageIdentifier); + + /** + * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory#createIPageModel(java.lang.Object) + * + * @param pageIdentifier + * @return + * @since 2.0 + */ + default IPageModel createIPageModel(Object pageIdentifier, String favoriteEditorID) { + return createIPageModel(pageIdentifier); + } + + /** + * Finds the EditorIDs that can open the given pageIdentifier. This list is a hint + * + * The exact behavior is implementation-specific; this method shouldn't be used + * to determine whether a page identifier can actually be opened. + * + * Implementations may return a list containing the {@link IPageManager#DEFAULT_EDITOR} ID, + * and the list might be incomplete (i.e. editors not listed might + * still be able to open the given pageIdentifier) + * + * @param pageIdentifier + * @return A map of (ID -> Label) of the editors that can open the given page + * + * @see {@link IPageManager#DEFAULT_EDITOR} + * @since 2.0 + */ + default Map<String, String> getEditorIDsFor(Object pageIdentifier) { + return Collections.singletonMap(DEFAULT_EDITOR, "Default editor"); + } +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java index 9430edf2787..df2826bf9d3 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageManagerImpl.java @@ -1,163 +1,166 @@ -/*****************************************************************************
- * Copyright (c) 2013, 2014 Cedric Dumoulin, CEA, 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 433371
- * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 415638
- * Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 440754
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.BasicPageManagerImpl;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * This class provide high level method to manage the Sash pages through its DI
- * implementation.
- *
- * @author cedric dumoulin
- *
- */
-public class PageManagerImpl extends BasicPageManagerImpl {
-
- /**
- * An object used to get the current folder, or to ask to set the
- * active page.
- * This is usually backuped by the SashWindowContainer. <br>
- */
- private ICurrentFolderAndPageMngr folderAndPageMngr;
-
- private ContentChangedEventProvider contentChangedEventProvider;
-
- /**
- * Constructor.
- * Use a default {@link ICurrentFolderAndPageMngr} that alwayrs use the first
- * folder as the current folder. Futhermore, the default implementation doesn't
- * allow to set the active folder. <br>
- * Suitable for tests
- *
- * @param diSashModel
- * The model onto which operation of this class act.
- * @param contentChangedEventProvider
- * A class listening on changes on the internal model and delivering events to registered listeners. This implementation
- * need the class in order to deactivate event triggering during the operations.
- *
- */
- protected PageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider) {
- super(diSashModel);
-
- this.contentChangedEventProvider = contentChangedEventProvider;
- this.folderAndPageMngr = new DefaultCurrentFolderAndPageMngr(diSashModel);
- }
-
- /**
- * Constructor.
- *
- * @param diSashModel
- * the di sash model
- * @param contentChangedEventProvider
- * the content changed event provider
- * @param folderAndPageMngr
- * the folder and page mngr
- */
- protected PageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider, ICurrentFolderAndPageMngr folderAndPageMngr) {
- super(diSashModel);
-
- this.contentChangedEventProvider = contentChangedEventProvider;
- this.folderAndPageMngr = folderAndPageMngr;
- }
-
- @Override
- protected TabFolder getCurrentFolder() {
- return folderAndPageMngr.getCurrentFolder();
- }
-
- @Override
- protected boolean isLegacyMode() {
- // We are never in legacy mode even if there is a page list
- return false;
- }
-
- @Override
- protected boolean isPage(EObject content) {
- return Platform.getAdapterManager().getAdapter(content, IOpenable.class) != null;
- }
-
- @Override
- public void closePage(Object pageIdentifier) {
- // Suppress event notifications
- doExecute(() -> super.closePage(pageIdentifier));
- }
-
- @Override
- public void closeAllOpenedPages() {
- // Suppress event notifications
- doExecute(() -> super.closeAllOpenedPages());
- }
-
- @Override
- public void closeOtherPages(Object pageIdentifier) {
- // Suppress event notifications
- doExecute(() -> super.closeOtherPages(pageIdentifier));
- }
-
- @Override
- public void selectPage(final Object pageIdentifier) {
- Display.getDefault().syncExec(new Runnable() {
-
- @Override
- public void run() {
- folderAndPageMngr.setActivePage(pageIdentifier);
- }
- });
- }
-
- /**
- * Sets the current folder and page mngr.
- *
- * @param currentFolderAndPageMngr
- * the new current folder and page mngr
- */
- public void setCurrentFolderAndPageMngr(ICurrentFolderAndPageMngr currentFolderAndPageMngr) {
- this.folderAndPageMngr = currentFolderAndPageMngr;
-
- }
-
- @Override
- protected <T> T doExecute(SashModelOperation<T> sashModelOperation) {
- T result;
-
- final boolean deliver = contentChangedEventProvider.isDeliver();
-
- contentChangedEventProvider.setDeliver(false);
- try {
- result = super.doExecute(sashModelOperation);
- } finally {
- contentChangedEventProvider.setDeliver(deliver);
- }
-
- return result;
- }
-
- private void doExecute(Runnable sashModelOperation) {
- doExecute(ignored -> {
- sashModelOperation.run();
- return ignored;
- });
- }
-
+/***************************************************************************** + * Copyright (c) 2013, 2014 Cedric Dumoulin, CEA, 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: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus (CEA) - bug 433371 + * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 415638 + * Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 440754 + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr; +import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.BasicPageManagerImpl; +import org.eclipse.swt.widgets.Display; + + +/** + * This class provide high level method to manage the Sash pages through its DI + * implementation. + * + * @author cedric dumoulin + * + */ +public class PageManagerImpl extends BasicPageManagerImpl { + + /** + * An object used to get the current folder, or to ask to set the + * active page. + * This is usually backuped by the SashWindowContainer. <br> + */ + private ICurrentFolderAndPageMngr folderAndPageMngr; + + private ContentChangedEventProvider contentChangedEventProvider; + + /** + * Constructor. + * Use a default {@link ICurrentFolderAndPageMngr} that alwayrs use the first + * folder as the current folder. Futhermore, the default implementation doesn't + * allow to set the active folder. <br> + * Suitable for tests + * + * @param diSashModel + * The model onto which operation of this class act. + * @param contentChangedEventProvider + * A class listening on changes on the internal model and delivering events to registered listeners. This implementation + * need the class in order to deactivate event triggering during the operations. + * + */ + protected PageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider) { + super(diSashModel); + + this.contentChangedEventProvider = contentChangedEventProvider; + this.folderAndPageMngr = new DefaultCurrentFolderAndPageMngr(diSashModel); + } + + /** + * Constructor. + * + * @param diSashModel + * the di sash model + * @param contentChangedEventProvider + * the content changed event provider + * @param folderAndPageMngr + * the folder and page mngr + */ + protected PageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider, ICurrentFolderAndPageMngr folderAndPageMngr) { + super(diSashModel); + + this.contentChangedEventProvider = contentChangedEventProvider; + this.folderAndPageMngr = folderAndPageMngr; + } + + @Override + protected TabFolder getCurrentFolder() { + return folderAndPageMngr.getCurrentFolder(); + } + + @Override + protected boolean isLegacyMode() { + // We are never in legacy mode even if there is a page list + return false; + } + + /** + * @since 2.0 + */ + @Override + protected boolean isPage(EObject content) { + return Platform.getAdapterManager().getAdapter(content, IOpenable.class) != null; + } + + @Override + public void closePage(Object pageIdentifier) { + // Suppress event notifications + doExecute(() -> super.closePage(pageIdentifier)); + } + + @Override + public void closeAllOpenedPages() { + // Suppress event notifications + doExecute(() -> super.closeAllOpenedPages()); + } + + @Override + public void closeOtherPages(Object pageIdentifier) { + // Suppress event notifications + doExecute(() -> super.closeOtherPages(pageIdentifier)); + } + + @Override + public void selectPage(final Object pageIdentifier) { + Display.getDefault().syncExec(new Runnable() { + + @Override + public void run() { + folderAndPageMngr.setActivePage(pageIdentifier); + } + }); + } + + /** + * Sets the current folder and page mngr. + * + * @param currentFolderAndPageMngr + * the new current folder and page mngr + */ + public void setCurrentFolderAndPageMngr(ICurrentFolderAndPageMngr currentFolderAndPageMngr) { + this.folderAndPageMngr = currentFolderAndPageMngr; + + } + + @Override + protected <T> T doExecute(SashModelOperation<T> sashModelOperation) { + T result; + + final boolean deliver = contentChangedEventProvider.isDeliver(); + + contentChangedEventProvider.setDeliver(false); + try { + result = super.doExecute(sashModelOperation); + } finally { + contentChangedEventProvider.setDeliver(deliver); + } + + return result; + } + + private void doExecute(Runnable sashModelOperation) { + doExecute(ignored -> { + sashModelOperation.run(); + return ignored; + }); + } + }
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java index a719de92179..d80bdfdf3a1 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/IPageUtils.java @@ -1,86 +1,87 @@ -/*****************************************************************************
- * Copyright (c) 2010, 2015 LIFL, CEA LIST, Christian W. Damus, 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:
- * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 433371
- * Christian W. Damus - bug 469188
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-
-
-/**
- * Class providing a utility methods allowing to get the real Model from the {@link IPage#getRawModel()}.
- * The utility takes into account the bug 309943.
- *
- * @author cedric dumoulin
- *
- */
-public class IPageUtils {
-
- /**
- * Get the real model rather than the PageRef. This method is a trick to temporally solve the bug 309943.
- *
- * @param page
- * @return
- */
- public static Object getRawModel(IPage page) {
-
- if (page == null) {
- return null;
- }
-
- Object pageModel = page.getRawModel();
- // Get the real model because of bug
- if (pageModel instanceof PageRef) {
- return ((PageRef) pageModel).getPageIdentifier();
- }
- // do not use trick
- return pageModel;
- }
-
- /**
- * Lookup the IPage model corresponding to the identifier from the {@link ISashWindowsContainer}.
- * The identifier can be either a {@link PageRef} or a emf Diagram. <br>
- * This method can be used as a hack to bug 401107
- *
- * @param container
- * @param identifier
- * @return The corresponding IPage, or null if not found.
- */
- public static IPage lookupModelPage(ISashWindowsContainer container, Object identifier) {
-
- LookupIPageVisitor visitor = new LookupIPageVisitor(identifier);
- container.visit(visitor);
- return visitor.getResult();
- }
-
- /**
- * Queries whether the user should be permitted to close a {@code page}.
- *
- * @param page
- * a page
- * @return whether it can be closed
- */
- public static boolean canClose(IPage page) {
- ICloseablePart closeable = (page instanceof IAdaptable)
- ? ((IAdaptable) page).getAdapter(ICloseablePart.class)
- : null;
-
- return (closeable == null) || closeable.canClose();
- }
-}
+/***************************************************************************** + * Copyright (c) 2010, 2015 LIFL, CEA LIST, Christian W. Damus, 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: + * Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus (CEA) - bug 433371 + * Christian W. Damus - bug 469188 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage; +import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer; +import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef; + + +/** + * Class providing a utility methods allowing to get the real Model from the {@link IPage#getRawModel()}. + * The utility takes into account the bug 309943. + * + * @author cedric dumoulin + * + */ +public class IPageUtils { + + /** + * Get the real model rather than the PageRef. This method is a trick to temporally solve the bug 309943. + * + * @param page + * @return + */ + public static Object getRawModel(IPage page) { + + if (page == null) { + return null; + } + + Object pageModel = page.getRawModel(); + // Get the real model because of bug + if (pageModel instanceof PageRef) { + return ((PageRef) pageModel).getPageIdentifier(); + } + // do not use trick + return pageModel; + } + + /** + * Lookup the IPage model corresponding to the identifier from the {@link ISashWindowsContainer}. + * The identifier can be either a {@link PageRef} or a emf Diagram. <br> + * This method can be used as a hack to bug 401107 + * + * @param container + * @param identifier + * @return The corresponding IPage, or null if not found. + */ + public static IPage lookupModelPage(ISashWindowsContainer container, Object identifier) { + + LookupIPageVisitor visitor = new LookupIPageVisitor(identifier); + container.visit(visitor); + return visitor.getResult(); + } + + /** + * Queries whether the user should be permitted to close a {@code page}. + * + * @param page + * a page + * @return whether it can be closed + * @since 2.0 + */ + public static boolean canClose(IPage page) { + ICloseablePart closeable = (page instanceof IAdaptable) + ? ((IAdaptable) page).getAdapter(ICloseablePart.class) + : null; + + return (closeable == null) || closeable.canClose(); + } +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml index 1daf5ae6e56..3f95ec850c6 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core.sasheditor.di</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project index c456b7b004d..23969754582 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project @@ -1,33 +1,57 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.sasheditor</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.ibm.etools.common.migration.MigrationBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.sasheditor</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.ibm.etools.common.migration.MigrationBuilder</name> + <arguments> + </arguments> + </buildCommand> + <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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF index b30c3ac802c..a878f6ba291 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF @@ -1,28 +1,26 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.core.sasheditor,
- org.eclipse.papyrus.infra.core.sasheditor.contentprovider,
- org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,
- org.eclipse.papyrus.infra.core.sasheditor.editor,
- org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor,
- org.eclipse.papyrus.infra.core.sasheditor.internal,
- org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy,
- org.eclipse.papyrus.infra.core.sasheditor.multipage.editor,
- org.eclipse.papyrus.infra.core.sasheditor.utils
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ui,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.e4.core.contexts;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.e4.ui.model.workbench;bundle-version="0.10.0";resolution:=optional,
- org.eclipse.core.expressions;bundle-version="3.4.300",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor;singleton:=true
-Eclipse-ExtensibleAPI: true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.core.sasheditor, + org.eclipse.papyrus.infra.core.sasheditor.contentprovider, + org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple, + org.eclipse.papyrus.infra.core.sasheditor.editor, + org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor, + org.eclipse.papyrus.infra.core.sasheditor.internal;x-internal:=true, + org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;x-internal:=true, + org.eclipse.papyrus.infra.core.sasheditor.multipage.editor, + org.eclipse.papyrus.infra.core.sasheditor.utils +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.e4.core.contexts;bundle-version="[1.5.0,2.0.0)";resolution:=optional, + org.eclipse.e4.ui.model.workbench;bundle-version="[1.2.0,2.0.0)";resolution:=optional, + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 2.0.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.core.sasheditor.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor;singleton:=true +Eclipse-ExtensibleAPI: true diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml index 57ef0408764..9b6018eda67 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core.sasheditor</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ICloseablePart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ICloseablePart.java index 9431a6dc30e..c3c2ccd413d 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ICloseablePart.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ICloseablePart.java @@ -22,6 +22,8 @@ import org.eclipse.ui.IWorkbenchPart; * {@linkplain IMultiPageEditorPart multi-page editor} that are conditionally * closeable. That is, parts that may not always be permitted to be closed by the * user. + * + * @since 2.0 */ public interface ICloseablePart { /** diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java index 85a1bb84394..5f40b99dc8f 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PagePart.java @@ -1,274 +1,279 @@ -/*****************************************************************************
- * Copyright (c) 2009, 2015 CEA LIST & LIFL, Christian W. Damus, 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus - bug 469188
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.internal;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * This class represent a leaf part that is a part containing an editor or a component.
- *
- * @author dumoulin
- */
-public abstract class PagePart extends AbstractPart implements IPage, IAdaptable {
-
- /** Raw model associated to this part. We store it because the PartModel do not provide it */
- protected Object rawModel;
-
- /** Parent part of this Part */
- protected TabFolderPart parent;
-
-
- /**
- * Constructor.
- *
- * @param sashWindowsContainer
- */
- public PagePart(TabFolderPart parent, Object rawModel) {
- super(parent.getSashWindowContainer());
- this.parent = parent;
- this.rawModel = rawModel;
- }
-
- @Override
- public <T> T getAdapter(Class<T> adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- /**
- * @return the parent
- */
- protected TabFolderPart getParent() {
- return parent;
- }
-
-
- /**
- * Get the {@link TabItemPart} that is associated to this Page. <br>
- * The {@link TabItemPart} represents the tab in the folder.
- *
- * @return
- */
- protected TabItemPart getAssociatedTabItemPart() {
-
- // TabItemPart is not directly accessible. We should ask it to
- // the parent.
- return getParent().lookupAssociatedTabItemPart(this);
- }
-
- /**
- * Orphan this node. The parent is set to null, but control is left unchanged.
- * The node can be reattached with reparent(). Change garbage state to {@link GarbageState.ORPHANED}.
- * This method as no effect if the Page has already been reparented.
- *
- * @see
- * @return the parent
- */
- public void orphan() {
- // orphan only if we are in COLLECTED state
- if (garbageState == GarbageState.UNVISITED) {
- garbageState = GarbageState.ORPHANED;
- parent = null;
- }
- }
-
- /**
- * Mark this Page as UNCHANGED.
- * The PAge should be in the COLLECTED state.
- *
- * @see
- * @return the parent
- */
- public void unchanged() {
- // orphan only if we are in COLLECTED state
- if (garbageState == GarbageState.UNVISITED || garbageState == GarbageState.ORPHANED) {
- garbageState = GarbageState.UNCHANGED;
- } else {
- // Bad state, this is an internal error
- // TODO : log a warning ?
- throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden.");
- }
- }
-
- /**
- * Visit this part.
- *
- * @param visitor
- * @return true if the visit should continue, false otherwise.
- */
- abstract boolean visit(IPartVisitor visitor);
-
- /**
- * Locates the part that intersects the given point and that have the expected type.
- * For a leaf, return the leaf if it is of the expected type.
- *
- * @param position
- * @param expectedTileType
- * @return
- */
- public AbstractPart findPartAt(Point position, Class<?> expectedTileType) {
-
- if (expectedTileType == this.getClass()) {
- return this;
- }
-
- return null;
- }
-
- /**
- * Create the control of this Part, and children's controls.
- *
- * @param parent
- */
- abstract public void createPartControl(Composite parent);
-
- /**
- * Get the control associated to this Part.
- *
- * @return
- */
- @Override
- abstract public Control getControl();
-
- /**
- * reparent this Part with the specified new parent.
- * The part is marked as reparented.
- *
- * @param parent
- */
- abstract public void reparent(TabFolderPart parent);
-
- /**
- * Return the {@link Widget} of the tab associated to this page.
- *
- * @return The {@link Widget} of the tab.
- */
- public Widget getTabWidget() {
- return getAssociatedTabItemPart().control;
- }
-
- /**
- * Add the tree of parts starting from this part.
- * As we are a leaf, add itself only.
- *
- * @param partMap
- */
- public void fillPartMap(PartLists partMap) {
- partMap.addLeaf(this);
- garbageState = GarbageState.UNVISITED;
- }
-
- /**
- * Get the raw model associated to this Part.
- *
- * @return
- */
- @Override
- public Object getRawModel() {
- return rawModel;
- }
-
- /**
- * Return a title for this part. This title can be used by parent to be shown
- * in tabs ...
- * To be implemented by subclasses.
- *
- * @return The title or null.
- */
- @Override
- public String getPageTitle() {
- return null;
- }
-
- /**
- * Return a icon for this part. This title can be used by parent to be shown
- * in tabs ...
- * To be implemented by subclasses.
- *
- * @return The icon or null.
- */
- @Override
- public Image getPageIcon() {
- return null;
- }
-
- /**
- * Refresh the tab of this page (I.e the name and icon in the tab).
- */
- public void refreshTab() {
- getParent().refreshPageTab(this);
- }
-
- /**
- * Queries whether I should be permitted to be closed.
- *
- * @return whether my containing tab should show the close widget
- */
- public boolean canClose() {
- ICloseablePart closeable = getAdapter(ICloseablePart.class);
- return (closeable == null)
- || (closeable == this) // Avoid unbounded re-entry into this method!
- || closeable.canClose();
- }
-
- /**
- * Set focus on the SWT control associated to this PagePart.
- * Used by the ActivePageTracker.
- */
- abstract public void setFocus();
-
- /**
- * Dispose the part. <br/>
- * The part and its associated resource are disposed.
- *
- */
- abstract public void dispose();
-
- /**
- * Dispose this part and all its children.
- * The method is called recursively on children of the part.
- */
- abstract public void disposeThisAndChildren();
-
- /**
- * Garbage the part. <br/>
- * This method is called by the sashwindows garbage mechanism. It means that the part has been marked as "garbage" or
- * is now unreachable. It is no longer used by the {@link SashWindowsContainer}, and it should be garbage. <br/>
- * All resources used by this node should be reclaimed, but not its subnodes.
- *
- */
- abstract public void garbage();
-
- /**
- * Return true if the part is associated to the specified rawModel.
- * Return false otherwise.
- *
- * @param realModel
- * @return
- */
- public boolean isPartFor(Object realModel) {
- return this.rawModel == realModel;
- }
-
-
-
-}
+/***************************************************************************** + * Copyright (c) 2009, 2015 CEA LIST & LIFL, Christian W. Damus, 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: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus - bug 469188 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.sasheditor.internal; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.Platform; +import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart; +import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage; +import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Widget; + +/** + * This class represent a leaf part that is a part containing an editor or a component. + * + * @author dumoulin + */ +public abstract class PagePart extends AbstractPart implements IPage, IAdaptable { + + /** Raw model associated to this part. We store it because the PartModel do not provide it */ + protected Object rawModel; + + /** Parent part of this Part */ + protected TabFolderPart parent; + + + /** + * Constructor. + * + * @param sashWindowsContainer + */ + public PagePart(TabFolderPart parent, Object rawModel) { + super(parent.getSashWindowContainer()); + this.parent = parent; + this.rawModel = rawModel; + } + + /** + * @since 2.0 + */ + @Override + public <T> T getAdapter(Class<T> adapter) { + return Platform.getAdapterManager().getAdapter(this, adapter); + } + + /** + * @return the parent + */ + protected TabFolderPart getParent() { + return parent; + } + + + /** + * Get the {@link TabItemPart} that is associated to this Page. <br> + * The {@link TabItemPart} represents the tab in the folder. + * + * @return + */ + protected TabItemPart getAssociatedTabItemPart() { + + // TabItemPart is not directly accessible. We should ask it to + // the parent. + return getParent().lookupAssociatedTabItemPart(this); + } + + /** + * Orphan this node. The parent is set to null, but control is left unchanged. + * The node can be reattached with reparent(). Change garbage state to {@link GarbageState.ORPHANED}. + * This method as no effect if the Page has already been reparented. + * + * @see + * @return the parent + */ + public void orphan() { + // orphan only if we are in COLLECTED state + if (garbageState == GarbageState.UNVISITED) { + garbageState = GarbageState.ORPHANED; + parent = null; + } + } + + /** + * Mark this Page as UNCHANGED. + * The PAge should be in the COLLECTED state. + * + * @see + * @return the parent + */ + public void unchanged() { + // orphan only if we are in COLLECTED state + if (garbageState == GarbageState.UNVISITED || garbageState == GarbageState.ORPHANED) { + garbageState = GarbageState.UNCHANGED; + } else { + // Bad state, this is an internal error + // TODO : log a warning ? + throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden."); + } + } + + /** + * Visit this part. + * + * @param visitor + * @return true if the visit should continue, false otherwise. + */ + abstract boolean visit(IPartVisitor visitor); + + /** + * Locates the part that intersects the given point and that have the expected type. + * For a leaf, return the leaf if it is of the expected type. + * + * @param position + * @param expectedTileType + * @return + */ + public AbstractPart findPartAt(Point position, Class<?> expectedTileType) { + + if (expectedTileType == this.getClass()) { + return this; + } + + return null; + } + + /** + * Create the control of this Part, and children's controls. + * + * @param parent + */ + abstract public void createPartControl(Composite parent); + + /** + * Get the control associated to this Part. + * + * @return + */ + @Override + abstract public Control getControl(); + + /** + * reparent this Part with the specified new parent. + * The part is marked as reparented. + * + * @param parent + */ + abstract public void reparent(TabFolderPart parent); + + /** + * Return the {@link Widget} of the tab associated to this page. + * + * @return The {@link Widget} of the tab. + */ + public Widget getTabWidget() { + return getAssociatedTabItemPart().control; + } + + /** + * Add the tree of parts starting from this part. + * As we are a leaf, add itself only. + * + * @param partMap + */ + public void fillPartMap(PartLists partMap) { + partMap.addLeaf(this); + garbageState = GarbageState.UNVISITED; + } + + /** + * Get the raw model associated to this Part. + * + * @return + */ + @Override + public Object getRawModel() { + return rawModel; + } + + /** + * Return a title for this part. This title can be used by parent to be shown + * in tabs ... + * To be implemented by subclasses. + * + * @return The title or null. + */ + @Override + public String getPageTitle() { + return null; + } + + /** + * Return a icon for this part. This title can be used by parent to be shown + * in tabs ... + * To be implemented by subclasses. + * + * @return The icon or null. + */ + @Override + public Image getPageIcon() { + return null; + } + + /** + * Refresh the tab of this page (I.e the name and icon in the tab). + */ + public void refreshTab() { + getParent().refreshPageTab(this); + } + + /** + * Queries whether I should be permitted to be closed. + * + * @return whether my containing tab should show the close widget + * @since 2.0 + */ + public boolean canClose() { + ICloseablePart closeable = getAdapter(ICloseablePart.class); + return (closeable == null) + || (closeable == this) // Avoid unbounded re-entry into this method! + || closeable.canClose(); + } + + /** + * Set focus on the SWT control associated to this PagePart. + * Used by the ActivePageTracker. + */ + abstract public void setFocus(); + + /** + * Dispose the part. <br/> + * The part and its associated resource are disposed. + * + */ + abstract public void dispose(); + + /** + * Dispose this part and all its children. + * The method is called recursively on children of the part. + */ + abstract public void disposeThisAndChildren(); + + /** + * Garbage the part. <br/> + * This method is called by the sashwindows garbage mechanism. It means that the part has been marked as "garbage" or + * is now unreachable. It is no longer used by the {@link SashWindowsContainer}, and it should be garbage. <br/> + * All resources used by this node should be reclaimed, but not its subnodes. + * + */ + abstract public void garbage(); + + /** + * Return true if the part is associated to the specified rawModel. + * Return false otherwise. + * + * @param realModel + * @return + */ + public boolean isPartFor(Object realModel) { + return this.rawModel == realModel; + } + + + +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project index 1efb06ad197..ab02956c61f 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF index 4e7d0584e0b..81205682d25 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF @@ -9,12 +9,12 @@ Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", - org.eclipse.emf.ecore.xmi;bundle-version="2.5.0";visibility:=reexport, - org.eclipse.uml2.types;visibility:=reexport, - org.eclipse.uml2.common;visibility:=reexport, - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0" +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)", + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-Version: 1.2.0.qualifier Bundle-ManifestVersion: 2 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java index dfd6a0b5ec6..49844528c02 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/DiPackage.java @@ -34,6 +34,8 @@ import org.eclipse.emf.ecore.EReference; * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory * @model kind="package" * @generated + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. */ public interface DiPackage extends EPackage { @@ -111,6 +113,7 @@ public interface DiPackage extends EPackage { * * @generated * @ordered + * @since 1.2 */ int SASH_MODEL__RESTORE_ACTIVE_PAGE = 2; @@ -367,6 +370,7 @@ public interface DiPackage extends EPackage { * * @generated * @ordered + * @since 1.2 */ int TAB_FOLDER__CURRENT_SELECTION = ABSTRACT_PANEL_FEATURE_COUNT + 1; @@ -428,6 +432,7 @@ public interface DiPackage extends EPackage { * * @generated * @ordered + * @since 1.2 */ int PAGE_REF__FAVORITE_EDITOR = 3; @@ -703,6 +708,7 @@ public interface DiPackage extends EPackage { * @see org.eclipse.papyrus.infra.core.sashwindows.di.SashModel#isRestoreActivePage() * @see #getSashModel() * @generated + * @since 1.2 */ EAttribute getSashModel_RestoreActivePage(); @@ -901,6 +907,7 @@ public interface DiPackage extends EPackage { * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#getCurrentSelection() * @see #getTabFolder() * @generated + * @since 1.2 */ EReference getTabFolder_CurrentSelection(); @@ -960,6 +967,7 @@ public interface DiPackage extends EPackage { * @see org.eclipse.papyrus.infra.core.sashwindows.di.PageRef#getFavoriteEditor() * @see #getPageRef() * @generated + * @since 1.2 */ EAttribute getPageRef_FavoriteEditor(); @@ -1200,6 +1208,7 @@ public interface DiPackage extends EPackage { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ EAttribute SASH_MODEL__RESTORE_ACTIVE_PAGE = eINSTANCE.getSashModel_RestoreActivePage(); @@ -1365,6 +1374,7 @@ public interface DiPackage extends EPackage { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ EReference TAB_FOLDER__CURRENT_SELECTION = eINSTANCE.getTabFolder_CurrentSelection(); @@ -1412,6 +1422,7 @@ public interface DiPackage extends EPackage { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ EAttribute PAGE_REF__FAVORITE_EDITOR = eINSTANCE.getPageRef_FavoriteEditor(); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java index 4820610dea4..f0b8a35b88b 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/PageRef.java @@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EObject; * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef() * @model * @generated + * @noimplement This interface is not intended to be implemented by clients. */ public interface PageRef extends EObject { @@ -129,6 +130,7 @@ public interface PageRef extends EObject { * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getPageRef_FavoriteEditor() * @model dataType="org.eclipse.uml2.types.String" ordered="false" * @generated + * @since 1.2 */ String getFavoriteEditor(); @@ -141,6 +143,7 @@ public interface PageRef extends EObject { * the new value of the '<em>Favorite Editor</em>' attribute. * @see #getFavoriteEditor() * @generated + * @since 1.2 */ void setFavoriteEditor(String value); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java index e22c9c9cc73..1066931f633 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/SashModel.java @@ -100,6 +100,7 @@ public interface SashModel extends EObject { * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getSashModel_RestoreActivePage() * @model dataType="org.eclipse.papyrus.infra.core.sashwindows.di.boolean" required="true" ordered="false" * @generated + * @since 1.2 */ boolean isRestoreActivePage(); @@ -112,6 +113,7 @@ public interface SashModel extends EObject { * the new value of the '<em>Restore Active Page</em>' attribute. * @see #isRestoreActivePage() * @generated + * @since 1.2 */ void setRestoreActivePage(boolean value); @@ -167,6 +169,7 @@ public interface SashModel extends EObject { * * @model folderRequired="true" folderOrdered="false" pageRefRequired="true" pageRefOrdered="false" * @generated + * @since 1.2 */ void addPage(TabFolder folder, PageRef pageRef); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java index 4f23a2bb492..66ad1f1aecd 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/TabFolder.java @@ -72,6 +72,7 @@ public interface TabFolder extends AbstractPanel { * @see org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage#getTabFolder_CurrentSelection() * @model ordered="false" * @generated + * @since 1.2 */ PageRef getCurrentSelection(); @@ -84,6 +85,7 @@ public interface TabFolder extends AbstractPanel { * the new value of the '<em>Current Selection</em>' reference. * @see #getCurrentSelection() * @generated + * @since 1.2 */ void setCurrentSelection(PageRef value); @@ -129,6 +131,7 @@ public interface TabFolder extends AbstractPanel { * * @model pageRefRequired="true" pageRefOrdered="false" * @generated + * @since 1.2 */ void addPage(PageRef pageRef); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java index 90b134c448a..a5a67ed8f2d 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/DiPackageImpl.java @@ -44,6 +44,7 @@ import org.eclipse.uml2.types.TypesPackage; * <!-- end-user-doc --> * * @generated + * @noreference This class is not intended to be referenced by clients. */ public class DiPackageImpl extends EPackageImpl implements DiPackage { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java index 7592c4f57a4..816877a3d1a 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/PageRefImpl.java @@ -89,6 +89,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef { * @see #getFavoriteEditor() * @generated * @ordered + * @since 1.2 */ protected static final String FAVORITE_EDITOR_EDEFAULT = null; @@ -100,6 +101,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef { * @see #getFavoriteEditor() * @generated * @ordered + * @since 1.2 */ protected String favoriteEditor = FAVORITE_EDITOR_EDEFAULT; @@ -430,6 +432,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ @Override public String getFavoriteEditor() { @@ -441,6 +444,7 @@ public class PageRefImpl extends EObjectImpl implements PageRef { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ @Override public void setFavoriteEditor(String newFavoriteEditor) { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java index 1ee2eba6960..77669197fdd 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/SashModelImpl.java @@ -61,7 +61,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel { private static final int SWT_VERTICAL = 1 << 9; // from SWT.VERTICAL private static final int SWT_LEFT = 1 << 14; // from SWT.LEFT private static final int SWT_RIGHT = 1 << 17; // from SWT.RIGHT - + /** * The cached value of the '{@link #getWindows() <em>Windows</em>}' containment reference list. * <!-- begin-user-doc --> @@ -92,6 +92,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel { * @see #isRestoreActivePage() * @generated * @ordered + * @since 1.2 */ protected static final boolean RESTORE_ACTIVE_PAGE_EDEFAULT = false; @@ -103,6 +104,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel { * @see #isRestoreActivePage() * @generated * @ordered + * @since 1.2 */ protected boolean restoreActivePage = RESTORE_ACTIVE_PAGE_EDEFAULT; @@ -191,6 +193,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ @Override public boolean isRestoreActivePage() { @@ -202,6 +205,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ @Override public void setRestoreActivePage(boolean newRestoreActivePage) { @@ -243,6 +247,7 @@ public class SashModelImpl extends EObjectImpl implements SashModel { * <!-- end-user-doc --> * * @generated NOT + * @since 1.2 */ @Override public void addPage(TabFolder folder, PageRef pageRef) { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java index 78b101351ab..75e82c4e982 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src-gen/org/eclipse/papyrus/infra/core/sashwindows/di/impl/TabFolderImpl.java @@ -64,6 +64,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder { * @see #getCurrentSelection() * @generated * @ordered + * @since 1.2 */ protected PageRef currentSelection; @@ -110,6 +111,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder { * @see #getChildren() * @generated * @ordered + * @since 1.2 */ protected static final int[] CHILDREN_ESUBSETS = new int[] { DiPackage.TAB_FOLDER__CURRENT_SELECTION }; @@ -118,6 +120,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ @Override public PageRef getCurrentSelection() { @@ -138,6 +141,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ public PageRef basicGetCurrentSelection() { return currentSelection; @@ -148,6 +152,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder { * <!-- end-user-doc --> * * @generated + * @since 1.2 */ @Override public void setCurrentSelection(PageRef newCurrentSelection) { @@ -198,6 +203,7 @@ public class TabFolderImpl extends AbstractPanelImpl implements TabFolder { * <!-- end-user-doc --> * * @generated NOT + * @since 1.2 */ @Override public void addPage(PageRef pageRef) { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java index 9161ebbdbfb..7df5f601d12 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/src/org/eclipse/papyrus/infra/core/sashwindows/di/util/DiUtils.java @@ -224,6 +224,7 @@ public class DiUtils { * the identifier of the page(s) to be removed * * @return the memoized close-all-pages command, or {@code null} if there are no pages to close + * @since 1.2 */ public static Command getMemoizedCloseAllPagesCommand(final TransactionalEditingDomain domain, final IPageManager pageManager, final Object pageIdentifier) { Command result = null; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core/.project index 5aff7adb53d..433d017e1cf 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.project +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF index e0d039e4b5b..13277bf4d84 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF @@ -1,37 +1,36 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.core,
- org.eclipse.papyrus.infra.core.clipboard,
- org.eclipse.papyrus.infra.core.editor,
- org.eclipse.papyrus.infra.core.extension,
- org.eclipse.papyrus.infra.core.internal.expressions;x-internal:=true,
- org.eclipse.papyrus.infra.core.internal.sashmodel;x-internal:=true,
- org.eclipse.papyrus.infra.core.language,
- org.eclipse.papyrus.infra.core.listenerservice,
- org.eclipse.papyrus.infra.core.markers,
- org.eclipse.papyrus.infra.core.modelsetquery,
- org.eclipse.papyrus.infra.core.modelsetquery.impl;x-friends:="org.eclipse.papyrus.uml.resourceloading.profile",
- org.eclipse.papyrus.infra.core.operation,
- org.eclipse.papyrus.infra.core.resource,
- org.eclipse.papyrus.infra.core.resource.additional,
- org.eclipse.papyrus.infra.core.resource.sasheditor,
- org.eclipse.papyrus.infra.core.services,
- org.eclipse.papyrus.infra.core.services.spi,
- org.eclipse.papyrus.infra.core.utils
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.workspace;bundle-version="1.5.1",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.core.filesystem,
- org.eclipse.emf.ecore.xmi;bundle-version="2.12.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.5.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.core.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.core, + org.eclipse.papyrus.infra.core.clipboard, + org.eclipse.papyrus.infra.core.editor, + org.eclipse.papyrus.infra.core.extension, + org.eclipse.papyrus.infra.core.internal.expressions;x-internal:=true, + org.eclipse.papyrus.infra.core.internal.sashmodel;x-internal:=true, + org.eclipse.papyrus.infra.core.language, + org.eclipse.papyrus.infra.core.listenerservice, + org.eclipse.papyrus.infra.core.markers, + org.eclipse.papyrus.infra.core.modelsetquery, + org.eclipse.papyrus.infra.core.modelsetquery.impl;x-friends:="org.eclipse.papyrus.uml.resourceloading.profile", + org.eclipse.papyrus.infra.core.operation, + org.eclipse.papyrus.infra.core.resource, + org.eclipse.papyrus.infra.core.resource.additional, + org.eclipse.papyrus.infra.core.resource.sasheditor, + org.eclipse.papyrus.infra.core.services, + org.eclipse.papyrus.infra.core.services.spi, + org.eclipse.papyrus.infra.core.utils +Require-Bundle: org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.commands;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.infra.core.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml index 1ac9fb4d645..505d993b1c3 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java index 11fe67ac9f6..070ea1c06e4 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java @@ -1,83 +1,84 @@ -/*****************************************************************************
- * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core";
-
- // The shared instance
- private static Activator plugin;
-
- /** Logging helper */
- public static LogHelper log;
-
- private ServiceTracker<IContextualServiceRegistryTracker, IContextualServiceRegistryTracker> serviceRegistryTrackerTracker;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- // register the log helper
- log = new LogHelper(this);
-
- serviceRegistryTrackerTracker = new ServiceTracker<>(context, IContextualServiceRegistryTracker.class, null);
- serviceRegistryTrackerTracker.open();
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- serviceRegistryTrackerTracker.close();
- serviceRegistryTrackerTracker = null;
-
- plugin = null;
- log = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /**
- * Obtain the instance of the contextual service-registry tracker service, if any.
- *
- * @return the service-registry tracker service, or {@code null} if none (probably
- * because there is no UI and, therefore, no user to be editing any Papyrus models)
- */
- public IContextualServiceRegistryTracker getContextualServiceRegistryTracker() {
- return serviceRegistryTrackerTracker.getService();
- }
-}
+/***************************************************************************** + * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, 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: + * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core; + +import org.eclipse.core.runtime.Plugin; +import org.eclipse.papyrus.infra.core.log.LogHelper; +import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker; +import org.osgi.framework.BundleContext; +import org.osgi.util.tracker.ServiceTracker; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core"; + + // The shared instance + private static Activator plugin; + + /** Logging helper */ + public static LogHelper log; + + private ServiceTracker<IContextualServiceRegistryTracker, IContextualServiceRegistryTracker> serviceRegistryTrackerTracker; + + /** + * The constructor + */ + public Activator() { + } + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + // register the log helper + log = new LogHelper(this); + + serviceRegistryTrackerTracker = new ServiceTracker<>(context, IContextualServiceRegistryTracker.class, null); + serviceRegistryTrackerTracker.open(); + } + + @Override + public void stop(BundleContext context) throws Exception { + serviceRegistryTrackerTracker.close(); + serviceRegistryTrackerTracker = null; + + plugin = null; + log = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Obtain the instance of the contextual service-registry tracker service, if any. + * + * @return the service-registry tracker service, or {@code null} if none (probably + * because there is no UI and, therefore, no user to be editing any Papyrus models) + * @since 2.0 + */ + public IContextualServiceRegistryTracker getContextualServiceRegistryTracker() { + return serviceRegistryTrackerTracker.getService(); + } +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguage.java index 57b9ecf391b..471f1650a36 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguage.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguage.java @@ -61,6 +61,7 @@ public interface ILanguage { * a model set in which the language is {@linkplain #install(ModelSet) installed} * * @return the language's model in the {code modelSet}, or {@code null} if there is no corresponding model + * @since 2.0 */ default IModel getModel(ModelSet modelSet) { return LanguageModelRegistry.INSTANCE.getModel(this, modelSet); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageProvider.java index 76388ec7953..f95b2e3a69b 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageProvider.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageProvider.java @@ -51,6 +51,7 @@ public interface ILanguageProvider { * a {@link ModelSet} in which to find the instantiated languages * * @return the languages instantiated in the specified resource + * @since 2.0 */ default Iterable<ILanguage> getLanguages(ILanguageService languageService, ModelSet modelSet) { return getLanguages(languageService, modelSet.getURIWithoutExtension(), false); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageService.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageService.java index 9ccc1effb22..1dce4f08f43 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageService.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/language/ILanguageService.java @@ -64,6 +64,7 @@ public interface ILanguageService extends IAdaptable, ILanguageChangeListener { * a {@link ModelSet} in which to find the instantiated languages * * @return the languages instantiated in the specified resource + * @since 2.0 */ Set<ILanguage> getLanguages(ModelSet modelSet); @@ -109,6 +110,7 @@ public interface ILanguageService extends IAdaptable, ILanguageChangeListener { * * @return its language models, which may be empty if the model-set is not in a * service registry that has a language service + * @since 2.0 */ static Collection<IModel> getLanguageModels(ModelSet modelSet) { List<IModel> result; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java index a1742831f77..6aa34544b9d 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractBaseModel.java @@ -429,6 +429,9 @@ public abstract class AbstractBaseModel extends AbstractModel implements IVersio return false; } + /** + * @since 2.0 + */ @Override public Iterable<? extends EObject> getRootElements() { Iterable<? extends EObject> result; @@ -452,6 +455,7 @@ public abstract class AbstractBaseModel extends AbstractModel implements IVersio * @param object * an object in a resource * @return whether it is a root element + * @since 2.0 */ protected boolean isRootElement(EObject object) { return object.eContainer() == null; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModel.java index a11561b9a58..4409acfcf85 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModel.java @@ -144,6 +144,8 @@ public abstract class AbstractModel implements IModel { /** * Starts my registered snippets. + * + * @since 2.0 */ protected void startSnippets() { if (!snippetsStarted) { @@ -154,6 +156,8 @@ public abstract class AbstractModel implements IModel { /** * Stops my registered snippets. + * + * @since 2.0 */ protected void stopSnippets() { if (snippetsStarted) { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java index b665e30baef..16a27040ee7 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java @@ -181,14 +181,22 @@ public abstract class EMFLogicalModel extends AbstractBaseModel implements IEMFM /** * The very basic requirement is that I have a {@link #getResource() resource} in which * to persist the {@code object}. + * + * @since 2.0 */ @Override public boolean canPersist(EObject object) { return (getResource() != null) && isSupportedRoot(object); } + /** + * @since 2.0 + */ protected abstract boolean isSupportedRoot(EObject object); + /** + * @since 2.0 + */ @Override public void persist(EObject object) { if (!canPersist(object)) { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java index 63c5c0324fc..c408b0cf8e1 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java @@ -37,6 +37,7 @@ public interface IEMFModel extends IModel { * @return the model roots, or an empty iterable if either there definitively are none * or they cannot be determined (for example, because the main resource is a controlled * unit and the parent unit is not available) + * @since 2.0 */ public Iterable<? extends EObject> getRootElements(); @@ -66,6 +67,7 @@ public interface IEMFModel extends IModel { * @return whether I should persist the {@code object} * * @see #persist(EObject) + * @since 2.0 */ public boolean canPersist(EObject object); @@ -80,6 +82,7 @@ public interface IEMFModel extends IModel { * if I cannot persist the {@code object} * * @see #canPersist(EObject) + * @since 2.0 */ public void persist(EObject object); } diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java index ea5967b3683..4aad7200d86 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java @@ -1300,6 +1300,7 @@ public class ModelSet extends ResourceSetImpl { * an object to be persisted as a new root of a managed EMF {@code Resource} * * @return the model that is best suited to persist the {@code object}, or {@code null} if none + * @since 2.0 */ public IEMFModel getModelToPersist(EObject object) { return models.values().stream() diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java index ae3edded14d..d64dc7bffb0 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java @@ -357,6 +357,7 @@ public class ModelsReader extends ExtensionUtils { * @param modelSet * a model-set * @return ones that are required + * @since 2.0 */ public Set<IModel> getRequiredModels(ModelSet modelSet) { return getRequiredModels(modelSet, IModel.class); @@ -370,6 +371,7 @@ public class ModelsReader extends ExtensionUtils { * @param modelType * the specific type of models to request * @return ones that are required + * @since 2.0 */ public <M extends IModel> Set<M> getRequiredModels(ModelSet modelSet, Class<M> modelType) { Set<String> requiredModelClasses = Stream.of(getExtensions()) diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ResourceAdapter.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ResourceAdapter.java index ea15d69ab94..cb84db8587f 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ResourceAdapter.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ResourceAdapter.java @@ -385,6 +385,9 @@ public abstract class ResourceAdapter extends AdapterImpl { } } + /** + * @since 2.0 + */ protected void handleResourceSetChangeEvent0(ResourceSetChangeEvent event) { try { notifications = event.getNotifications(); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java index c853d4b32b7..9b356bb68c9 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java @@ -62,8 +62,17 @@ import com.google.common.base.Objects; */ public class SashModel extends EMFLogicalModel implements IModel { + /** + * @since 2.0 + */ public static final String PROPERTY_PRIVATE_RESOURCE_URI = "privateResourceURI"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static final String PROPERTY_SHARED_RESOURCE_URI = "sharedResourceURI"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static final String PROPERTY_LEGACY_MODE = "legacyMode"; //$NON-NLS-1$ private final PropertyChangeSupport bean = new PropertyChangeSupport(this); @@ -293,6 +302,9 @@ public class SashModel extends EMFLogicalModel implements IModel { return saveOptions; } + /** + * @since 2.0 + */ public boolean isLegacyMode() { if (legacyMode == null) { legacyMode = false; // Assume not @@ -329,6 +341,7 @@ public class SashModel extends EMFLogicalModel implements IModel { * of whether that actually is the resource that currently stores the sash model. * * @return the private sash-model resource URI + * @since 2.0 */ public URI getPrivateResourceURI() { URI modelURI = (getModelManager() == null) ? null : getModelManager().getURIWithoutExtension(); @@ -341,6 +354,7 @@ public class SashModel extends EMFLogicalModel implements IModel { * sash model. * * @return the shared sash-model resource URI + * @since 2.0 */ public URI getSharedResourceURI() { URI modelURI = (getModelManager() == null) ? null : getModelManager().getURIWithoutExtension(); @@ -361,18 +375,30 @@ public class SashModel extends EMFLogicalModel implements IModel { // Bean API // + /** + * @since 2.0 + */ public void addPropertyChangeListener(PropertyChangeListener listener) { bean.addPropertyChangeListener(listener); } + /** + * @since 2.0 + */ public void removePropertyChangeListener(PropertyChangeListener listener) { bean.removePropertyChangeListener(listener); } + /** + * @since 2.0 + */ public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { bean.addPropertyChangeListener(propertyName, listener); } + /** + * @since 2.0 + */ public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { bean.removePropertyChangeListener(propertyName, listener); } diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java index 1b8bffb9923..334971d5feb 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java @@ -1,150 +1,153 @@ -/*****************************************************************************
- * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, 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:
- * LIFL - Initial API and implementation
- * Christian W. Damus - bug 434983
- * Christian W. Damus - bug 469188
- * Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.resource.sasheditor;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.ModelUtils;
-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-
-/**
- * Set of utility methods linked to Trace for ControlMode
- *
- * @author cedric dumoulin
- *
- */
-public class SashModelUtils {
-
- /**
- * Gets the SashModel for the currently selected editor. <br>
- * Warning: This method is designed to be call from ui.handlers. It is not
- * designed to be call from Editors. This method can return null if called
- * during the MultiEditor initialization.
- *
- * @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
- *
- * @return The {@link SashModel} of the current editor, or null if not
- * found.
- * @deprecated Use {@link #getSashModel(ModelSet)} or {@link #getSashModel(ServicesRegistry)} instead
- */
- @Deprecated
- public static SashModel getSashModel() {
-
- try {
- return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID);
- } catch (ServiceException e) {
- return null;
- }
- }
-
- /**
- * Gets the SashModel for the currently selected editor. <br>
- * Warning: This method is designed to be call from ui.handlers. It is not
- * designed to be call from Editors. This method can return null if called
- * during the MultiEditor initialization.
- *
- * @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
- *
- * @return The {@link SashModel} of the current editor, or null if not
- * found.
- * @throws ServiceException
- * If an error occurs while getting or starting the service.
- * @deprecated Use {@link #getSashModelChecked(ServicesRegistry)} instead
- */
- @Deprecated
- public static SashModel getSashModelChecked() throws ServiceException {
-
- return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID);
- }
-
- /**
- * Gets the SashModel from the {@link ModelSet}. <br>
- *
- * @param modelsManager
- * The modelManager containing the requested model.
- *
- * @return The {@link SashModel} registered in modelManager, or null if not
- * found.
- */
- public static SashModel getSashModel(ModelSet modelsManager) {
-
- return (SashModel) modelsManager.getModel(SashModel.MODEL_ID);
- }
-
- /**
- * Gets the SashModel from the {@link ModelSet}. <br>
- *
- * @param ServicesRegistry
- * The servie registry under which the ModelSet is registered.
- *
- * @return The {@link SashModel} registered in modelManager, or null if not
- * found.
- */
- public static SashModel getSashModel(ServicesRegistry servicesRegistry) {
-
- try {
- return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID);
- } catch (ServiceException e) {
- return null;
- }
- }
-
- /**
- * Gets the SashModel from the {@link ModelSet}. <br>
- *
- * @param ServicesRegistry
- * The servie registry under which the ModelSet is registered.
- *
- * @return The {@link SashModel} registered in modelManager, or null if not
- * found.
- * @throws ServiceException
- * If the service can't be returned.
- */
- public static SashModel getSashModelChecked(ServicesRegistry servicesRegistry) throws ServiceException {
-
- return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID);
- }
-
- /**
- * Retrieve the uri of the initial di opened
- *
- * @param modelSet
- * @return
- */
- public static URI getInitialURI(ModelSet modelSet) {
- return SashModelUtils.getSashModel(modelSet).getResourceURI();
- }
-
- public static SashWindowsMngr getSashWindowsMngr(ModelSet modelSet) {
- SashWindowsMngr result = null;
-
- SashModel model = getSashModel(modelSet);
- if (model != null) {
- Resource resource = model.getResource();
- if (resource != null) {
- result = (SashWindowsMngr) EcoreUtil.getObjectByType(resource.getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR);
- }
- }
-
- return result;
- }
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, 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: + * LIFL - Initial API and implementation + * Christian W. Damus - bug 434983 + * Christian W. Damus - bug 469188 + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.core.resource.sasheditor; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +import org.eclipse.papyrus.infra.core.resource.ModelUtils; +import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage; +import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.core.utils.ServiceUtils; + +/** + * Set of utility methods linked to Trace for ControlMode + * + * @author cedric dumoulin + * + */ +public class SashModelUtils { + + /** + * Gets the SashModel for the currently selected editor. <br> + * Warning: This method is designed to be call from ui.handlers. It is not + * designed to be call from Editors. This method can return null if called + * during the MultiEditor initialization. + * + * @see ServiceUtilsForActionHandlers.getInstance().getModelSet() + * + * @return The {@link SashModel} of the current editor, or null if not + * found. + * @deprecated Use {@link #getSashModel(ModelSet)} or {@link #getSashModel(ServicesRegistry)} instead + */ + @Deprecated + public static SashModel getSashModel() { + + try { + return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID); + } catch (ServiceException e) { + return null; + } + } + + /** + * Gets the SashModel for the currently selected editor. <br> + * Warning: This method is designed to be call from ui.handlers. It is not + * designed to be call from Editors. This method can return null if called + * during the MultiEditor initialization. + * + * @see ServiceUtilsForActionHandlers.getInstance().getModelSet() + * + * @return The {@link SashModel} of the current editor, or null if not + * found. + * @throws ServiceException + * If an error occurs while getting or starting the service. + * @deprecated Use {@link #getSashModelChecked(ServicesRegistry)} instead + */ + @Deprecated + public static SashModel getSashModelChecked() throws ServiceException { + + return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID); + } + + /** + * Gets the SashModel from the {@link ModelSet}. <br> + * + * @param modelsManager + * The modelManager containing the requested model. + * + * @return The {@link SashModel} registered in modelManager, or null if not + * found. + */ + public static SashModel getSashModel(ModelSet modelsManager) { + + return (SashModel) modelsManager.getModel(SashModel.MODEL_ID); + } + + /** + * Gets the SashModel from the {@link ModelSet}. <br> + * + * @param ServicesRegistry + * The servie registry under which the ModelSet is registered. + * + * @return The {@link SashModel} registered in modelManager, or null if not + * found. + */ + public static SashModel getSashModel(ServicesRegistry servicesRegistry) { + + try { + return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID); + } catch (ServiceException e) { + return null; + } + } + + /** + * Gets the SashModel from the {@link ModelSet}. <br> + * + * @param ServicesRegistry + * The servie registry under which the ModelSet is registered. + * + * @return The {@link SashModel} registered in modelManager, or null if not + * found. + * @throws ServiceException + * If the service can't be returned. + */ + public static SashModel getSashModelChecked(ServicesRegistry servicesRegistry) throws ServiceException { + + return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID); + } + + /** + * Retrieve the uri of the initial di opened + * + * @param modelSet + * @return + */ + public static URI getInitialURI(ModelSet modelSet) { + return SashModelUtils.getSashModel(modelSet).getResourceURI(); + } + + /** + * @since 2.0 + */ + public static SashWindowsMngr getSashWindowsMngr(ModelSet modelSet) { + SashWindowsMngr result = null; + + SashModel model = getSashModel(modelSet); + if (model != null) { + Resource resource = model.getResource(); + if (resource != null) { + result = (SashWindowsMngr) EcoreUtil.getObjectByType(resource.getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR); + } + } + + return result; + } +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java index a7ce2a07d80..fc78dc5e481 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java @@ -61,6 +61,7 @@ public class ExtensionServicesRegistry extends ServicesRegistry { * * @throws ServiceException * on any problem in the loading of service registrations + * @since 2.0 */ public ExtensionServicesRegistry() throws ServiceException { this(Activator.PLUGIN_ID); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/spi/IContextualServiceRegistryTracker.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/spi/IContextualServiceRegistryTracker.java index 1150740f204..b08601506be 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/spi/IContextualServiceRegistryTracker.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/spi/IContextualServiceRegistryTracker.java @@ -20,6 +20,8 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry; * that is associated with the user's current editing context, if any. * When the user is not editing any Papyrus model, then presumably there * is no need for any service registry. + * + * @since 2.0 */ @FunctionalInterface public interface IContextualServiceRegistryTracker { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java index d04e02fcd7f..54fd40a134c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java @@ -56,6 +56,7 @@ public abstract class AbstractServiceUtils<T> { * Papyrus editor or view is active (implying the model that the user is currently editing). * * @return the contextual service registry, or {@code null} if none can be determined + * @since 2.0 */ protected ServicesRegistry getContextualServiceRegistry() { IContextualServiceRegistryTracker tracker = Activator.getDefault().getContextualServiceRegistryTracker(); @@ -81,6 +82,7 @@ public abstract class AbstractServiceUtils<T> { * @return * @throws ServiceException * If an error occurs while getting the requested service. + * @since 2.0 */ public IPageManager getIPageManager(T from) throws ServiceException { return getServiceRegistry(from).getService(IPageManager.class); @@ -167,6 +169,7 @@ public abstract class AbstractServiceUtils<T> { * the Papyrus context from which to derive the registry * * @return the Papyrus callable + * @since 2.0 */ public <V> IPapyrusCallable<V> callable(IProgressCallable<V> callable, T from) { return new IPapyrusCallable<V>() { @@ -200,6 +203,7 @@ public abstract class AbstractServiceUtils<T> { * the Papyrus context from which to derive the registry * * @return the Papyrus runnable + * @since 2.0 */ public IPapyrusRunnable runnable(IProgressRunnable runnable, T from) { return new IPapyrusRunnable() { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusCallable.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusCallable.java index 5d7b6edd304..32f7313b03f 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusCallable.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusCallable.java @@ -20,6 +20,8 @@ import org.eclipse.papyrus.infra.tools.util.IProgressCallable; /** * Protocol for a callable in the Papyrus context. + * + * @since 2.0 */ @FunctionalInterface public interface IPapyrusCallable<V> extends IProgressCallable<V>, IServiceRegistryProvider { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusRunnable.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusRunnable.java index 4c8d2f1d008..a08be8c70de 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusRunnable.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusRunnable.java @@ -20,6 +20,8 @@ import org.eclipse.papyrus.infra.tools.util.IProgressRunnable; /** * Protocol for a runnable in the Papyrus context. + * + * @since 2.0 */ @FunctionalInterface public interface IPapyrusRunnable extends IProgressRunnable, IServiceRegistryProvider { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IServiceRegistryProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IServiceRegistryProvider.java index 36c50087af5..67e46de1b3a 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IServiceRegistryProvider.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IServiceRegistryProvider.java @@ -18,6 +18,8 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry; /** * A protocol for any object that can provide the context of a Papyrus * {@link ServicesRegistry} in which it is exists. + * + * @since 2.0 */ @FunctionalInterface public interface IServiceRegistryProvider { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java index 29fcefbed91..7f00384381a 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java @@ -59,6 +59,9 @@ public class TransactionHelper { public static final String TRANSACTION_OPTION_MERGE_NESTED_READ = "papyrus.merge_nested_read"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static void run(EditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException { if (domain instanceof TransactionalEditingDomain) { run((TransactionalEditingDomain) domain, writeOperation); @@ -67,6 +70,9 @@ public class TransactionHelper { } } + /** + * @since 2.0 + */ public static void run(TransactionalEditingDomain domain, final Runnable writeOperation) throws InterruptedException, RollbackException { if (domain instanceof InternalTransactionalEditingDomain) { run((InternalTransactionalEditingDomain) domain, writeOperation); @@ -82,6 +88,9 @@ public class TransactionHelper { } } + /** + * @since 2.0 + */ public static void run(InternalTransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException { Transaction transaction = domain.startTransaction(false, Collections.emptyMap()); try { @@ -472,6 +481,7 @@ public class TransactionHelper { * @param runnable * a progress runnable that is to borrow the {@code domain}'s active transaction on the modal context thread * @return the privileged runnable, ready to pass into the {@link IExecutorService} or other such API + * @since 2.0 */ public static IProgressRunnable createPrivilegedRunnable(TransactionalEditingDomain domain, final IProgressRunnable runnable) { IProgressMonitor monitorHolder[] = { null }; @@ -493,6 +503,7 @@ public class TransactionHelper { * @param callable * a progress callable that is to borrow the {@code domain}'s active transaction on the modal context thread * @return the privileged callable, ready to pass into the {@link IExecutorService} or other such API + * @since 2.0 */ public static <V> IProgressCallable<V> createPrivilegedCallable(TransactionalEditingDomain domain, final IProgressCallable<V> callable) { IProgressMonitor monitorHolder[] = { null }; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/.project b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.project index 29096480f24..f5c92898122 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/.project +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.project @@ -20,9 +20,37 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/.api_filters b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/.api_filters new file mode 100644 index 00000000000..793433951ae --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/.api_filters @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.tools" version="2"> + <resource path="src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableCollection.java" type="org.eclipse.papyrus.infra.tools.databinding.DelegatingObservableCollection"> + <filter comment="Cannot extend the core platform observable class so the interface must be implemented" id="574619656"> + <message_arguments> + <message_argument value="IObservableCollection<E>"/> + <message_argument value="DelegatingObservableCollection<T>"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableList.java" type="org.eclipse.papyrus.infra.tools.databinding.DelegatingObservableList"> + <filter comment="Cannot extend the core platform observable class so the interface must be implemented" id="574619656"> + <message_arguments> + <message_argument value="IObservableList<E>"/> + <message_argument value="DelegatingObservableList"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSet.java" type="org.eclipse.papyrus.infra.tools.databinding.DelegatingObservableSet"> + <filter comment="Cannot extend the core platform observable class so the interface must be implemented" id="574619656"> + <message_arguments> + <message_argument value="IObservableSet<E>"/> + <message_argument value="DelegatingObservableSet"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValue.java" type="org.eclipse.papyrus.infra.tools.databinding.DelegatingObservableValue"> + <filter comment="Cannot extend the core platform observable class so the interface must be implemented" id="574619656"> + <message_arguments> + <message_argument value="IObservableValue<T>"/> + <message_argument value="DelegatingObservableValue"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF index 6960891c38a..4bd5703e012 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF @@ -5,15 +5,13 @@ Export-Package: org.eclipse.papyrus.infra.tools, org.eclipse.papyrus.infra.tools.notify, org.eclipse.papyrus.infra.tools.spi, org.eclipse.papyrus.infra.tools.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.emf.ecore.xmi;bundle-version="2.9.0", - org.eclipse.core.expressions;bundle-version="3.4.500", - com.google.guava;bundle-version="11.0.0" +Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + com.google.guava;bundle-version="11.0.0";visibility:=reexport, + org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)";visibility:=reexport Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Eclipse-BuddyPolicy: dependent Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml index 6c56c86b074..28f1cab8cac 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.tools</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java index 4c598486f70..90e4b99cb06 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java @@ -22,6 +22,8 @@ import org.osgi.util.tracker.ServiceTracker; /** * The activator class controls the plug-in life cycle + * + * @since 2.0 */ public class Activator extends Plugin { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservable.java index 1e10dec5a1e..e9ee1d6b91b 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservable.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservable.java @@ -15,6 +15,9 @@ import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.emf.common.command.Command; +/** + * @since 2.0 + */ public interface CommandBasedObservable extends IObservable { /** diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservableValue.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservableValue.java index 06450cf6856..1ab52646e1f 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservableValue.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservableValue.java @@ -14,6 +14,9 @@ package org.eclipse.papyrus.infra.tools.databinding; import org.eclipse.core.databinding.observable.value.IObservableValue; +/** + * @since 2.0 + */ public interface CommandBasedObservableValue extends CommandBasedObservable, IObservableValue { } diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java index 438f111b664..198010851f5 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java @@ -23,6 +23,8 @@ import org.eclipse.core.databinding.observable.value.WritableValue; /** * An analogue of the {@link WritableValue} that supports "touches" to send * change events even though the value is not replaced. + * + * @since 2.0 */ public class TouchableValue<T> extends ReferenceCountedObservable.Value<T> { private final Class<? extends T> type; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java index 236d80cfcef..e258fe2c495 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java @@ -31,6 +31,8 @@ import org.eclipse.core.databinding.observable.list.WritableList; /** * A specialization of the core Databindings {@link WritableList} providing * iterators that support modification. + * + * @since 2.0 */ public class WritableListWithIterator<E> extends WritableList<E> implements ReferenceCountedObservable { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/IContext.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/IContext.java index 93d0e10e3dc..2d415d09af8 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/IContext.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/IContext.java @@ -19,6 +19,8 @@ import java.util.Map; /** * The Class Context. + * + * @since 2.0 */ public interface IContext { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotification.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotification.java index 55bc0f2f8cf..29b01e76b1f 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotification.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotification.java @@ -17,6 +17,8 @@ package org.eclipse.papyrus.infra.tools.notify; /** * The Interface INotification. * offers some services for a notification + * + * @since 2.0 */ public interface INotification { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotificationBuilder.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotificationBuilder.java index 84bb3b4ace6..860cca042ef 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotificationBuilder.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotificationBuilder.java @@ -16,6 +16,8 @@ package org.eclipse.papyrus.infra.tools.notify; /** * Protocol of a pluggable notification builder. + * + * @since 2.0 */ public interface INotificationBuilder { /** asynchronous, determines if the message needs or not to be synchronous with the notification */ diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/LogNotification.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/LogNotification.java index a4554cb06ed..0a03f47cb24 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/LogNotification.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/LogNotification.java @@ -17,6 +17,8 @@ import org.eclipse.papyrus.infra.tools.Activator; /** * A simple notification that just emits a message to the log. + * + * @since 2.0 */ public class LogNotification implements INotification { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationBuilder.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationBuilder.java index 9d54d4204d9..1bd1241fae9 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationBuilder.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationBuilder.java @@ -27,6 +27,7 @@ import org.eclipse.papyrus.infra.tools.spi.INotificationBuilderFactory; * the run method launch the message according to the value of the attributes * * @author tristan faure + * @since 2.0 * */ public class NotificationBuilder implements INotificationBuilder { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationRunnable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationRunnable.java index 3df50c005ab..41f25c78146 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationRunnable.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationRunnable.java @@ -15,6 +15,8 @@ package org.eclipse.papyrus.infra.tools.notify; /** * a runnable + * + * @since 2.0 * */ public interface NotificationRunnable { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/Type.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/Type.java index 61c73981778..cdc5ad54ce3 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/Type.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/Type.java @@ -22,6 +22,7 @@ package org.eclipse.papyrus.infra.tools.notify; * <li>QUESTION</i> * * @author tristan faure + * @since 2.0 * */ public enum Type { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java index cc2ff542665..b90c2df9c7c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java @@ -17,6 +17,8 @@ import org.eclipse.papyrus.infra.tools.util.IExecutorService; /** * An OSGi service protocol for creation of an executor service on the UI thread. + * + * @since 2.0 */ @FunctionalInterface public interface IExecutorServiceFactory { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/INotificationBuilderFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/INotificationBuilderFactory.java index a527ec3c592..6d7ad78d90c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/INotificationBuilderFactory.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/INotificationBuilderFactory.java @@ -18,6 +18,8 @@ import org.eclipse.papyrus.infra.tools.notify.INotificationBuilder; /** * An OSGi service protocol for creation of a notification builder * (preferably for UI presentation). + * + * @since 2.0 */ @FunctionalInterface public interface INotificationBuilderFactory { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CompositeServiceTracker.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CompositeServiceTracker.java index 2dab30d9eba..dd0ffa38648 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CompositeServiceTracker.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CompositeServiceTracker.java @@ -26,6 +26,8 @@ import org.osgi.util.tracker.ServiceTracker; /** * A service tracker that provides a single service as a composite of * registered service implementations. + * + * @since 2.0 */ public class CompositeServiceTracker<S> extends ServiceTracker<S, S> { private final AtomicReference<S> delegate = new AtomicReference<>(); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java index 14604007bc2..0e8f1578da5 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java @@ -20,6 +20,8 @@ import org.eclipse.papyrus.infra.tools.Activator; /** * A provider of {@link Executor}s offering various synchronous and asynchronous * execution characteristics. + * + * @since 2.0 */ public class CoreExecutors { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java index e816ade859c..7365980fa29 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java @@ -23,6 +23,8 @@ import java.util.concurrent.Future; * execution of tasks, with the possibility that these could be optimized * where appropriate (such as in a UI-thread executor to use a {@code syncExec} * call). + * + * @since 2.0 */ public interface IExecutorService extends ExecutorService { /** diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressCallable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressCallable.java index ff2601ca8ad..d0706de7829 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressCallable.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressCallable.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * reporting to these callables. * * @see IExecutorService + * @since 2.0 */ @FunctionalInterface public interface IProgressCallable<V> { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressRunnable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressRunnable.java index 124099a64fc..a70e517fd64 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressRunnable.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressRunnable.java @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * reporting to these runnables. * * @see IExecutorService + * @since 2.0 */ @FunctionalInterface public interface IProgressRunnable { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java index 316b4683f9a..ea43f2823b9 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java @@ -99,6 +99,7 @@ public class PlatformHelper { * a default adapter to return if none can be obtained (may be {@code null} * * @return the best-effort adapter of the given {@code type}, else the {@code defaultAdapter} + * @since 2.0 */ public static <T> T getAdapter(Object object, Class<T> type, T defaultAdapter) { T result = defaultAdapter; @@ -125,6 +126,7 @@ public class PlatformHelper { * obtained by the usual means (may be {@code null} * * @return the best-effort adapter of the given {@code type}, else the {@code defaultAdapter} + * @since 2.0 */ public static <T> T getAdapter(Object object, Class<T> type, Supplier<T> defaultAdapter) { T result = null; diff --git a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.project b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.project index 583a3cf1181..a348ff4a401 100644 --- a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.project +++ b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.project @@ -1,28 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.serviceregistry.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.serviceregistry.edit</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.project b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.project index 046bf32ee5e..2f445345d67 100644 --- a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.project +++ b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.project @@ -1,28 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.serviceregistry.editor</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.serviceregistry.editor</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/.project b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/.project index d686710282c..8519dcb1134 100644 --- a/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/.project +++ b/plugins/infra/core/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/.project @@ -1,28 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.core.serviceregistry</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.core.serviceregistry</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.project b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.project index 06ea6f87f79..b12e9567745 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.project +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.discovery.ui.menu</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.discovery.ui.menu</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF index 305b9eb7491..2b228c62a4f 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF @@ -1,16 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.discovery.ui.menu,
- org.eclipse.papyrus.infra.discovery.ui.menu.handler
-Require-Bundle: org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.discovery.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.menu.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui.menu;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.discovery.ui.menu, + org.eclipse.papyrus.infra.discovery.ui.menu.handler +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.discovery.ui;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.menu.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui.menu;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/.project b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/.project index 07c066b7b71..cbab51d1dfc 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/.project +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.discovery.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.discovery.ui</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/.settings/.api_filters b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/.settings/.api_filters new file mode 100644 index 00000000000..579ec7ece77 --- /dev/null +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/.settings/.api_filters @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.discovery.ui" version="2"> + <resource path="src/org/eclipse/papyrus/infra/discovery/ui/viewer/DiscoveryViewer.java" type="org.eclipse.papyrus.infra.discovery.ui.viewer.DiscoveryViewer"> + <filter comment="No public setter is provided for FontData.height as for other fields" id="623939596"> + <message_arguments> + <message_argument value="FontData"/> + <message_argument value="DiscoveryViewer"/> + <message_argument value="height"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/discovery/ui/wizards/DiscoveryComponent.java" type="org.eclipse.papyrus.infra.discovery.ui.wizards.DiscoveryComponent"> + <filter comment="This has to change with every major release and isn't intended for clients anyways" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.discovery.ui.wizards.DiscoveryComponent"/> + <message_argument value="DISCOVERY_PAPYRUS_URI"/> + <message_argument value="http://www.eclipse.org/modeling/mdt/papyrus/downloads/discovery/mars/papyrus-extra.xmi"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF index c5b5e3e8c93..0dc71f77056 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF @@ -1,32 +1,29 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.equinox.p2.core,
- org.eclipse.equinox.p2.ui,
- org.eclipse.equinox.p2.metadata,
- org.eclipse.equinox.p2.metadata.repository,
- org.eclipse.equinox.p2.repository,
- org.eclipse.equinox.p2.engine,
- org.eclipse.equinox.p2.director,
- org.eclipse.equinox.p2.operations;resolution:=optional,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui,
- org.eclipse.ui.forms,
- org.eclipse.papyrus.infra.discovery;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.discovery.ui,
- org.eclipse.papyrus.infra.discovery.ui.viewer,
- org.eclipse.papyrus.infra.discovery.ui.wizards
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.equinox.p2.core;bundle-version="[2.4.0,3.0.0)", + org.eclipse.equinox.p2.ui;bundle-version="[2.4.0,3.0.0)", + org.eclipse.equinox.p2.metadata;bundle-version="[2.3.0,3.0.0)", + org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.2.0,2.0.0)", + org.eclipse.equinox.p2.repository;bundle-version="[2.3.0,3.0.0)", + org.eclipse.equinox.p2.engine;bundle-version="[2.4.0,3.0.0)", + org.eclipse.equinox.p2.director;bundle-version="[2.3.0,3.0.0)", + org.eclipse.equinox.p2.operations;bundle-version="[2.4.0,3.0.0)";resolution:=optional, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.discovery;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.discovery.ui, + org.eclipse.papyrus.infra.discovery.ui.viewer, + org.eclipse.papyrus.infra.discovery.ui.wizards +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 2.0.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml index 355261cb978..e3b9ccc45db 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.discovery.ui</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/wizards/DiscoveryComponent.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/wizards/DiscoveryComponent.java index 07cb81eec34..b5861e9dbf7 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/wizards/DiscoveryComponent.java +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/wizards/DiscoveryComponent.java @@ -1,82 +1,86 @@ -/*****************************************************************************
- * Copyright (c) 2012 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:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.discovery.ui.wizards;
-
-import java.io.IOException;
-import java.util.Collections;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
-import org.eclipse.papyrus.infra.discovery.ui.viewer.DiscoveryContentProvider;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Execution class for the execution of the discovery component
- */
-public class DiscoveryComponent {
-
- /** URI of the model where all extra component features to be installed are referenced */
- public static final String DISCOVERY_PAPYRUS_URI = "http://www.eclipse.org/modeling/mdt/papyrus/downloads/discovery/neon/papyrus-extra.xmi";
-
- public static final Object execute() {
- final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
- DiscoveryContentProvider provider = new DiscoveryContentProvider() {
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected DiscoveryDefinition load() {
- Resource res = new XMIResourceImpl(URI.createURI(DISCOVERY_PAPYRUS_URI));
- try {
- res.load(Collections.EMPTY_MAP);
- } catch (IOException e) {
- MessageDialog.openError(window.getShell(), Messages.DiscoveryComponent_CannotConnectToSource_title, Messages.DiscoveryComponent_CannotConnectToSource_label);
- throw new RuntimeException(e);
- }
- return (DiscoveryDefinition) res.getContents().get(0);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getDescription() {
- return Messages.DiscoveryComponent_description;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getTitle() {
- return Messages.DiscoveryComponent_title;
- }
-
- };
-
-
- DiscoveryWizard wizard = new DiscoveryWizard(provider);
- WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
- return dialog.open();
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2012 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: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.discovery.ui.wizards; + +import java.io.IOException; +import java.util.Collections; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition; +import org.eclipse.papyrus.infra.discovery.ui.viewer.DiscoveryContentProvider; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; + + +/** + * Execution class for the execution of the discovery component + */ +public class DiscoveryComponent { + + /** + * URI of the model where all extra component features to be installed are referenced. + * + * @noreference This field is not intended to be referenced by clients. + */ + public static final String DISCOVERY_PAPYRUS_URI = "http://www.eclipse.org/modeling/mdt/papyrus/downloads/discovery/neon/papyrus-extra.xmi"; + + public static final Object execute() { + final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + + DiscoveryContentProvider provider = new DiscoveryContentProvider() { + + /** + * {@inheritDoc} + */ + @Override + protected DiscoveryDefinition load() { + Resource res = new XMIResourceImpl(URI.createURI(DISCOVERY_PAPYRUS_URI)); + try { + res.load(Collections.EMPTY_MAP); + } catch (IOException e) { + MessageDialog.openError(window.getShell(), Messages.DiscoveryComponent_CannotConnectToSource_title, Messages.DiscoveryComponent_CannotConnectToSource_label); + throw new RuntimeException(e); + } + return (DiscoveryDefinition) res.getContents().get(0); + } + + /** + * {@inheritDoc} + */ + @Override + public String getDescription() { + return Messages.DiscoveryComponent_description; + } + + /** + * {@inheritDoc} + */ + @Override + public String getTitle() { + return Messages.DiscoveryComponent_title; + } + + }; + + + DiscoveryWizard wizard = new DiscoveryWizard(provider); + WizardDialog dialog = new WizardDialog(window.getShell(), wizard); + return dialog.open(); + } + +} diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.project b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.project index 1491287da94..9c77b216c90 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.project +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.discovery</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.discovery</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF index 8e52eae7f03..274072ee03f 100644 --- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF +++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecore;bundle-version="2.8.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.discovery,
- org.eclipse.papyrus.infra.discovery.impl,
- org.eclipse.papyrus.infra.discovery.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.discovery.Activator$Implementation
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.discovery, + org.eclipse.papyrus.infra.discovery.impl, + org.eclipse.papyrus.infra.discovery.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.discovery.Activator$Implementation +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.project b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.project index 7759ae463d1..31e6ffdcd28 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.project +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF index 8acb2478870..ebe3263362b 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF @@ -6,23 +6,15 @@ Export-Package: org.eclipse.papyrus.infra.editor.welcome.nattable, org.eclipse.papyrus.infra.editor.welcome.nattable.painter, org.eclipse.papyrus.infra.editor.welcome.nattable.sorting, org.eclipse.papyrus.infra.editor.welcome.nattable.widgets -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.ui;bundle-version="3.100.0", - org.eclipse.core.databinding;bundle-version="1.6.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="1.4.0", - org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="1.4.0", - ca.odell.glazedlists;bundle-version="1.9.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.editor.welcome;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport, + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, + org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)", + ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.editor.welcome;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.project b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.project index df264f6400e..78847e5adf3 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.project +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF index 9dc8a6d97c7..b31bb6ac1d6 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF @@ -3,33 +3,17 @@ Export-Package: org.eclipse.papyrus.infra.editor.welcome, org.eclipse.papyrus.infra.editor.welcome.internal;x-internal:=true, org.eclipse.papyrus.infra.editor.welcome.internal.commands;x-internal:=true, org.eclipse.papyrus.infra.editor.welcome.internal.constraints;x-internal:=true, - org.eclipse.papyrus.infra.editor.welcome.internal.dnd, + org.eclipse.papyrus.infra.editor.welcome.internal.dnd;x-internal:=true, org.eclipse.papyrus.infra.editor.welcome.internal.impl;x-internal:=true, org.eclipse.papyrus.infra.editor.welcome.internal.modelelements;x-friends:="org.eclipse.papyrus.infra.editor.welcome.nattable", org.eclipse.papyrus.infra.editor.welcome.internal.operations;x-internal:=true, org.eclipse.papyrus.infra.editor.welcome.internal.preferences;x-internal:=true, org.eclipse.papyrus.infra.editor.welcome.internal.widgets;x-internal:=true, org.eclipse.papyrus.infra.editor.welcome.util -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.uml2.types;visibility:=reexport, - org.eclipse.uml2.common;visibility:=reexport, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.ui;bundle-version="3.100.0", - org.eclipse.ui.forms;bundle-version="3.7.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0", - org.eclipse.core.databinding;bundle-version="1.6.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.emf.transaction;bundle-version="1.9.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.editor.welcome.internal.constraints" Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.project index 8c0d3ad1182..5990bca3999 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.appearance</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.appearance</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/.api_filters b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/.api_filters new file mode 100644 index 00000000000..ec19a254b99 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.emf.appearance" version="2"> + <resource path="src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java" type="org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper"> + <filter comment="No developer would reasonably have modified this field" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper"/> + <message_argument value="EXTENSION_ID"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF index 76bf4d94668..036070fdca5 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF @@ -1,20 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.emf.appearance,
- org.eclipse.papyrus.infra.emf.appearance.commands,
- org.eclipse.papyrus.infra.emf.appearance.helper,
- org.eclipse.papyrus.infra.emf.appearance.style
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.infra.emf.appearance.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.appearance;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.emf.appearance, + org.eclipse.papyrus.infra.emf.appearance.commands, + org.eclipse.papyrus.infra.emf.appearance.helper, + org.eclipse.papyrus.infra.emf.appearance.style +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.infra.emf.appearance.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.appearance;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.project index 3e7b2dd7dcf..12dd7756c1e 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.diagram.common</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.diagram.common</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF index f1bffdb6c75..c0809d5521b 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF @@ -1,17 +1,12 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.emf.diagram.common, org.eclipse.papyrus.infra.emf.diagram.common.handler -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.core.commands;bundle-version="3.6.1", - org.eclipse.ui, - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)", + org.eclipse.core.commands;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.project index d198355a356..66de7666aa5 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF index 55ed840f623..f44ee9b426e 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF @@ -2,14 +2,11 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.emf.gmf.command, org.eclipse.papyrus.infra.emf.gmf.util, org.eclipse.papyrus.infra.emf.internal.gmf;x-internal:=true -Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project index ebfa82252ba..0d1f05526ae 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.readonly</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.readonly</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF index 09cd9998ca9..9845b1cdb2b 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF @@ -2,19 +2,14 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.emf.readonly, org.eclipse.papyrus.infra.emf.readonly.internal;x-friends:="org.eclipse.papyrus.infra.ui.emf", org.eclipse.papyrus.infra.emf.readonly.spi -Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.300", - org.eclipse.emf.workspace;bundle-version="1.4.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml index ead630febec..c801f2cf18f 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.readonly</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManager.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManager.java index 83d35ab9af5..45ca48d7724 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManager.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManager.java @@ -1,589 +1,590 @@ -/*****************************************************************************
- * Copyright (c) 2011, 2016 Atos Origin, CEA, Christian W. Damus, 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:
- * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
- * Christian W. Damus (CEA) - support non-IFile resources and object-level permissions (CDO)
- * Christian W. Damus (CEA) - bugs 323802, 429826, 422257, 437217
- * Christian W. Damus - bugs 457560, 463564, 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.emf.readonly;
-
-import static org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis.permissionAxes;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;
-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;
-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
-import org.eclipse.papyrus.infra.core.resource.IReadOnlyListener;
-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
-import org.eclipse.papyrus.infra.core.resource.ReadOnlyEvent;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.MapMaker;
-
-
-public class ReadOnlyManager implements IReadOnlyHandler2 {
-
- // Use weak values because the values otherwise retain the keys (indirectly)
- protected static final ConcurrentMap<EditingDomain, IReadOnlyHandler2> roHandlers = new MapMaker().weakKeys().weakValues().makeMap();
-
- private final CopyOnWriteArrayList<IReadOnlyListener> listeners = new CopyOnWriteArrayList<IReadOnlyListener>();
-
- private final ReadOnlyCache cache;
-
- private IReadOnlyListener forwardingListener;
-
- public static IReadOnlyHandler2 getReadOnlyHandler(EditingDomain editingDomain) {
- IReadOnlyHandler2 roHandler = IReadOnlyHandler2.NULL;
-
- if (editingDomain != null) {
- roHandler = roHandlers.get(editingDomain);
- if (roHandler == null) {
- roHandler = new ReadOnlyManager(editingDomain);
- process((ReadOnlyManager) roHandler, editingDomain);
- IReadOnlyHandler2 existing = roHandlers.putIfAbsent(editingDomain, roHandler);
- if (existing != null) {
- // Another thread beat us to it since we checked for an existing instance
- ((ReadOnlyManager) roHandler).cache.dispose();
- roHandler = existing;
- }
- }
- }
-
- return roHandler;
- }
-
- private static void process(ReadOnlyManager manager, EditingDomain domain) {
- Activator.getDefault().getReadOnlyManagerProcessors().forEach(p -> p.processReadOnlyManager(manager, domain));
- }
-
- protected static class HandlerPriorityPair implements Comparable<HandlerPriorityPair> {
-
- public Class<?> handlerClass;
-
- public int priority;
-
- public Set<ReadOnlyAxis> axes;
-
- @Override
- public int compareTo(HandlerPriorityPair o) {
- if (o.priority > priority) {
- return 1;
- } else if (o.priority < priority) {
- return -1;
- } else {
- return 0;
- }
- }
- }
-
- protected static final Map<Class<?>, Set<ReadOnlyAxis>> orderedHandlerClasses;
-
- static {
- IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.emf.readonly", "readOnlyHandler");
-
- List<HandlerPriorityPair> handlerPriorityPairs = new LinkedList<HandlerPriorityPair>();
- Map<String, HandlerPriorityPair> idMap = new HashMap<String, HandlerPriorityPair>();
-
- for (IConfigurationElement elem : configElements) {
- if ("readOnlyHandler".equals(elem.getName())) {
- try {
- HandlerPriorityPair handlerPriorityPair = new HandlerPriorityPair();
- String className = elem.getAttribute("class");
- handlerPriorityPair.handlerClass = Platform.getBundle(elem.getContributor().getName()).loadClass(className);
-
- handlerPriorityPair.priority = Integer.parseInt(elem.getAttribute("priority"));
-
- IConfigurationElement[] affinities = elem.getChildren("affinity");
- if ((affinities == null) || (affinities.length == 0)) {
- // implicit affinity is with any axis
- handlerPriorityPair.axes = ReadOnlyAxis.anyAxis();
- } else {
- handlerPriorityPair.axes = EnumSet.noneOf(ReadOnlyAxis.class);
- for (IConfigurationElement next : affinities) {
- handlerPriorityPair.axes.add(ReadOnlyAxis.valueOf(next.getAttribute("axis").toUpperCase()));
- }
- }
-
- String id = elem.getAttribute("id");
- if (id != null) {
- // if any then the handler could be overrided by another registration
- HandlerPriorityPair oldHandler = idMap.get(id);
- if (oldHandler == null) {
- idMap.put(id, handlerPriorityPair);
- handlerPriorityPairs.add(handlerPriorityPair);
- } else {
- if (oldHandler.priority < handlerPriorityPair.priority) {
- handlerPriorityPairs.remove(oldHandler);
- handlerPriorityPairs.add(handlerPriorityPair);
- }
- }
- } else {
- // If none the handler can not be overrided
- handlerPriorityPairs.add(handlerPriorityPair);
- }
- } catch (Throwable t) {
- // FIXME: We need to catch Throwables because we rely on external contributions. It is required to also catch Errors (such as compilation errors).
- // Move this code to an initialization method, because if a throwable is not caught, this will prevent the whole class initialization
- Activator.log.error(t);
- }
- }
- }
-
- Collections.sort(handlerPriorityPairs);
-
- orderedHandlerClasses = new LinkedHashMap<Class<?>, Set<ReadOnlyAxis>>();
-
- for (HandlerPriorityPair next : handlerPriorityPairs) {
- orderedHandlerClasses.put(next.handlerClass, next.axes);
- }
- }
-
-
- @SuppressWarnings("deprecation")
- protected static IReadOnlyHandler2 create(final Class<?> handlerClass, EditingDomain editingDomain) {
- boolean isEditingDomainConstructor = true;
- Constructor<?> constructor = null;
- try {
- constructor = handlerClass.getConstructor(EditingDomain.class);
- if (constructor == null) {
- isEditingDomainConstructor = false;
- constructor = handlerClass.getConstructor();
- }
-
- if (IReadOnlyHandler2.class.isAssignableFrom(constructor.getDeclaringClass())) {
- if (isEditingDomainConstructor) {
- return (IReadOnlyHandler2) constructor.newInstance(editingDomain);
- } else {
- return (IReadOnlyHandler2) constructor.newInstance();
- }
- } else if (IReadOnlyHandler.class.isAssignableFrom(constructor.getDeclaringClass())) {
- if (isEditingDomainConstructor) {
- return AbstractReadOnlyHandler.adapt((IReadOnlyHandler) constructor.newInstance(editingDomain), editingDomain);
- } else {
- return AbstractReadOnlyHandler.adapt((IReadOnlyHandler) constructor.newInstance(), editingDomain);
- }
- } else if (org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler.class.isAssignableFrom(constructor.getDeclaringClass())) {
- return new OldStyleHandlerAdapter((org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler) constructor.newInstance(), editingDomain);
- }
- } catch (Exception e) {
- }
-
- return null;
- }
-
- protected Map<ReadOnlyAxis, IReadOnlyHandler2[]> orderedHandlersByAxis;
-
- public ReadOnlyManager(final EditingDomain editingDomain) {
- // Create our transaction cache
- cache = ReadOnlyCache.create(this, Activator.getDefault().getReadOnlyCacheExecutor());
-
- final Map<ReadOnlyAxis, List<IReadOnlyHandler2>> handlers = new EnumMap<ReadOnlyAxis, List<IReadOnlyHandler2>>(ReadOnlyAxis.class);
- cache.run(new Runnable() {
-
- @Override
- public void run() {
- for (Map.Entry<Class<?>, Set<ReadOnlyAxis>> roClass : orderedHandlerClasses.entrySet()) {
- IReadOnlyHandler2 h = create(roClass.getKey(), editingDomain);
- if (h != null) {
- h.addReadOnlyListener(getForwardingListener());
-
- for (ReadOnlyAxis axis : roClass.getValue()) {
- List<IReadOnlyHandler2> list = handlers.get(axis);
- if (list == null) {
- list = new ArrayList<IReadOnlyHandler2>();
- handlers.put(axis, list);
- }
- list.add(h);
- }
- }
- }
- }
- });
-
- // Iterate the enumeration to make sure all axes are represented (even if only by an empty array)
- orderedHandlersByAxis = new EnumMap<ReadOnlyAxis, IReadOnlyHandler2[]>(ReadOnlyAxis.class);
- for (ReadOnlyAxis axis : ReadOnlyAxis.values()) {
- List<IReadOnlyHandler2> list = handlers.get(axis);
- if (list == null) {
- orderedHandlersByAxis.put(axis, new IReadOnlyHandler2[0]);
- } else {
- orderedHandlersByAxis.put(axis, list.toArray(new IReadOnlyHandler2[list.size()]));
- }
- }
- }
-
- @Override
- public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {
- final Set<URI> uriSet = ImmutableSet.copyOf(uris);
- Optional<Boolean> result = cache.getResources(axes, uriSet);
- if (result == null) {
- result = Optional.absent();
-
- ReadOnlyAxis[] all = ReadOnlyAxis.values();
- for (int i = 0; (i < all.length) && !result.or(Boolean.FALSE); i++) {
- if (axes.contains(all[i])) {
- result = anyReadOnly(all[i], uris);
- }
- }
-
- cache.putResources(axes, uriSet, result);
- }
-
- return result.isPresent() ? result : Optional.of(Boolean.FALSE);
- }
-
- private Optional<Boolean> anyReadOnly(ReadOnlyAxis axis, URI[] uris) {
- final Set<URI> uriSet = ImmutableSet.copyOf(uris);
- Set<ReadOnlyAxis> axes = axis.singleton();
- Optional<Boolean> result = cache.getResources(axes, uriSet);
- if (result == null) {
- result = Optional.absent();
-
- IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis);
- for (int i = 0; (i < orderedHandlers.length) && !result.isPresent(); i++) {
- result = orderedHandlers[i].anyReadOnly(axes, uris);
- }
-
- cache.putResources(axes, uriSet, result);
- }
-
- return result.isPresent() ? result : Optional.of(Boolean.FALSE);
- }
-
- @Override
- public Optional<Boolean> isReadOnly(Set<ReadOnlyAxis> axes, EObject eObject) {
- Optional<Boolean> result = cache.getObject(axes, eObject);
- if (result == null) {
- result = Optional.absent();
-
- ReadOnlyAxis[] all = ReadOnlyAxis.values();
- for (int i = 0; (i < all.length) && !result.or(Boolean.FALSE); i++) {
- if (axes.contains(all[i])) {
- result = isReadOnly(all[i], eObject);
- }
- }
-
- cache.putObject(axes, eObject, result);
- }
-
- return result.isPresent() ? result : Optional.of(Boolean.FALSE);
- }
-
- private Optional<Boolean> isReadOnly(ReadOnlyAxis axis, EObject eObject) {
- Set<ReadOnlyAxis> axes = axis.singleton();
- Optional<Boolean> result = cache.getObject(axes, eObject);
- if (result == null) {
- result = Optional.absent();
-
- IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis);
- for (int i = 0; (i < orderedHandlers.length) && !result.isPresent(); i++) {
- result = orderedHandlers[i].isReadOnly(axes, eObject);
- }
-
- cache.putObject(axes, eObject, result);
- }
-
- return result.isPresent() ? result : Optional.of(Boolean.FALSE);
- }
-
- @Override
- public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {
- Boolean finalResult = true;
-
- ReadOnlyAxis[] all = ReadOnlyAxis.values();
- for (int i = 0; (i < all.length) && finalResult; i++) {
- if (axes.contains(all[i])) {
- finalResult = makeWritable(all[i], uris);
- }
- }
-
- return Optional.of(finalResult);
- }
-
- private Boolean makeWritable(ReadOnlyAxis axis, URI[] uris) {
- Set<ReadOnlyAxis> axes = axis.singleton();
- Boolean finalResult = true;
-
- try {
- IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis);
- for (int i = 0; (i < orderedHandlers.length); i++) {
- Optional<Boolean> isRO = orderedHandlers[i].anyReadOnly(axes, uris);
- if (isRO.or(Boolean.FALSE)) {
- Optional<Boolean> result = orderedHandlers[i].makeWritable(axes, uris);
- // makeWritable should provide an answer since anyReadOnly returned a positive value.
- // If no answer consider it a failure
- if (!result.or(Boolean.FALSE)) {
- finalResult = false;
- break;
- }
- }
- }
- } finally {
- cache.clear();
- }
-
- return finalResult;
- }
-
- @Override
- public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, EObject eObject) {
- Boolean finalResult = true;
-
- ReadOnlyAxis[] all = ReadOnlyAxis.values();
- for (int i = 0; (i < all.length) && finalResult; i++) {
- if (axes.contains(all[i])) {
- finalResult = makeWritable(all[i], eObject);
- }
- }
-
- return Optional.of(finalResult);
- }
-
- private Boolean makeWritable(ReadOnlyAxis axis, EObject eObject) {
- Set<ReadOnlyAxis> axes = axis.singleton();
- Boolean finalResult = true;
-
- try {
- IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis);
- for (int i = 0; (i < orderedHandlers.length); i++) {
- Optional<Boolean> isRO = orderedHandlers[i].isReadOnly(axes, eObject);
- if (isRO.or(Boolean.FALSE)) {
- Optional<Boolean> result = orderedHandlers[i].makeWritable(axes, eObject);
- // makeWritable should provide an answer since anyReadOnly returned a positive value
- // if no answer consider it a failure
- if (!result.or(Boolean.FALSE)) {
- finalResult = false;
- break;
- }
- }
- }
- } finally {
- cache.clear();
- }
-
- return finalResult;
- }
-
- @Override
- public Optional<Boolean> canMakeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {
- Boolean result = false;
-
- ReadOnlyAxis[] all = ReadOnlyAxis.values();
- for (int i = 0; (i < all.length) && !result; i++) {
- if (axes.contains(all[i])) {
- result = canMakeWritable(all[i], uris);
- }
- }
-
- return Optional.of(result);
- }
-
- private Boolean canMakeWritable(ReadOnlyAxis axis, URI[] uris) {
- Set<ReadOnlyAxis> axes = axis.singleton();
- Boolean result = false;
-
- IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis);
- for (int i = 0; (i < orderedHandlers.length); i++) {
- if (orderedHandlers[i].anyReadOnly(axes, uris).or(false)) {
- // Only ask a handler about making writable what it considers to be read-only
- Optional<Boolean> canMakeWritable = orderedHandlers[i].canMakeWritable(axes, uris);
- if (canMakeWritable.isPresent()) {
- result = canMakeWritable.get();
- break;
- }
- }
- }
-
- return result;
- }
-
- @Override
- public Optional<Boolean> canMakeWritable(Set<ReadOnlyAxis> axes, EObject object) {
- Boolean result = false;
-
- ReadOnlyAxis[] all = ReadOnlyAxis.values();
- for (int i = 0; (i < all.length) && !result; i++) {
- if (axes.contains(all[i])) {
- result = canMakeWritable(all[i], object);
- }
- }
-
- return Optional.of(result);
- }
-
- private Boolean canMakeWritable(ReadOnlyAxis axis, EObject object) {
- Set<ReadOnlyAxis> axes = axis.singleton();
- Boolean result = false;
-
- IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis);
- for (int i = 0; (i < orderedHandlers.length); i++) {
- if (orderedHandlers[i].isReadOnly(axes, object).or(false)) {
- // Only ask a handler about making writable what it considers to be read-only
- Optional<Boolean> canMakeWritable = orderedHandlers[i].canMakeWritable(axes, object);
- if (canMakeWritable.isPresent()) {
- result = canMakeWritable.get();
- break;
- }
- }
- }
-
- return result;
- }
-
- @Override
- public void addReadOnlyListener(IReadOnlyListener listener) {
- listeners.addIfAbsent(listener);
- }
-
- @Override
- public void removeReadOnlyListener(IReadOnlyListener listener) {
- listeners.remove(listener);
- }
-
- private IReadOnlyListener getForwardingListener() {
- if (forwardingListener == null) {
- forwardingListener = new IReadOnlyListener() {
-
- @Override
- public void readOnlyStateChanged(ReadOnlyEvent event) {
- ReadOnlyEvent myEvent;
-
- switch (event.getEventType()) {
- case ReadOnlyEvent.OBJECT_READ_ONLY_STATE_CHANGED:
- myEvent = new ReadOnlyEvent(ReadOnlyManager.this, event.getAxis(), event.getObject(), event.isReadOnly());
- break;
- default:
- myEvent = new ReadOnlyEvent(ReadOnlyManager.this, event.getAxis(), event.getResourceURI(), event.isReadOnly());
- break;
- }
-
- notifyReadOnlyStateChanged(myEvent);
- }
- };
- }
-
- return forwardingListener;
- }
-
- protected void notifyReadOnlyStateChanged(ReadOnlyEvent event) {
- if (!listeners.isEmpty()) {
- for (IReadOnlyListener next : listeners) {
- try {
- next.readOnlyStateChanged(event);
- } catch (Exception e) {
- Activator.log.error("Uncaught exception in read-only state change listener.", e); //$NON-NLS-1$
- }
- }
- }
- }
-
- /**
- * Obtains a snapshot of the read-only handlers currently registered with me.
- *
- * @return my read-only handlers, by axis of affiliation. Changes to this collection
- * do not affect my registered handlers
- */
- public final Map<ReadOnlyAxis, Collection<IReadOnlyHandler2>> getReadOnlyHandlers() {
- Map<ReadOnlyAxis, Collection<IReadOnlyHandler2>> result = new HashMap<>();
-
- // Be sure not to provide lists that are actually backed by the arrays!
- orderedHandlersByAxis.forEach((axis, handlers) -> result.put(axis, Lists.newArrayList(handlers)));
-
- return result;
- }
-
- //
- // Deprecated API
- //
-
- @Override
- @Deprecated
- public Optional<Boolean> anyReadOnly(URI[] uris) {
- return anyReadOnly(permissionAxes(), uris);
- }
-
- @Override
- @Deprecated
- public Optional<Boolean> isReadOnly(EObject eObject) {
- return isReadOnly(permissionAxes(), eObject);
- }
-
- @Override
- @Deprecated
- public Optional<Boolean> makeWritable(URI[] uris) {
- return makeWritable(permissionAxes(), uris);
- }
-
- @Override
- @Deprecated
- public Optional<Boolean> makeWritable(EObject eObject) {
- return makeWritable(permissionAxes(), eObject);
- }
-
- //
- // Legacy adapters
- //
-
- @SuppressWarnings("deprecation")
- private static final class OldStyleHandlerAdapter extends AbstractReadOnlyHandler {
-
- private final org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler delegate;
-
- OldStyleHandlerAdapter(org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler handler, EditingDomain editingDomain) {
- super(editingDomain);
-
- this.delegate = handler;
- }
-
- @Override
- public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {
-
- // the old API contract is that handlers only return true if they
- // know it to be true, because the manager takes the first positive
- // answer. Moreover, they only dealt with permission-based read-only-ness
- boolean delegateResult = axes.contains(ReadOnlyAxis.PERMISSION) && delegate.isReadOnly(uris, getEditingDomain());
- return delegateResult ? Optional.of(Boolean.TRUE) : Optional.<Boolean> absent();
- }
-
- @Override
- public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {
-
- // the old API contract is that handlers only return false if they
- // tried to but could not make the resources writable, because the
- // manager takes the first negative answer (this is opposite to the
- // isReadOnly logic). Moreover, they only dealt with permission-based
- // read-only-ness
- boolean delegateResult = axes.contains(ReadOnlyAxis.PERMISSION) && delegate.enableWrite(uris, getEditingDomain());
- return delegateResult ? Optional.<Boolean> absent() : Optional.of(Boolean.FALSE);
- }
- }
-}
+/***************************************************************************** + * Copyright (c) 2011, 2016 Atos Origin, CEA, Christian W. Damus, 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: + * Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation + * Christian W. Damus (CEA) - support non-IFile resources and object-level permissions (CDO) + * Christian W. Damus (CEA) - bugs 323802, 429826, 422257, 437217 + * Christian W. Damus - bugs 457560, 463564, 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.emf.readonly; + +import static org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis.permissionAxes; + +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CopyOnWriteArrayList; + +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.Platform; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler; +import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler; +import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2; +import org.eclipse.papyrus.infra.core.resource.IReadOnlyListener; +import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis; +import org.eclipse.papyrus.infra.core.resource.ReadOnlyEvent; + +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.MapMaker; + + +public class ReadOnlyManager implements IReadOnlyHandler2 { + + // Use weak values because the values otherwise retain the keys (indirectly) + protected static final ConcurrentMap<EditingDomain, IReadOnlyHandler2> roHandlers = new MapMaker().weakKeys().weakValues().makeMap(); + + private final CopyOnWriteArrayList<IReadOnlyListener> listeners = new CopyOnWriteArrayList<IReadOnlyListener>(); + + private final ReadOnlyCache cache; + + private IReadOnlyListener forwardingListener; + + public static IReadOnlyHandler2 getReadOnlyHandler(EditingDomain editingDomain) { + IReadOnlyHandler2 roHandler = IReadOnlyHandler2.NULL; + + if (editingDomain != null) { + roHandler = roHandlers.get(editingDomain); + if (roHandler == null) { + roHandler = new ReadOnlyManager(editingDomain); + process((ReadOnlyManager) roHandler, editingDomain); + IReadOnlyHandler2 existing = roHandlers.putIfAbsent(editingDomain, roHandler); + if (existing != null) { + // Another thread beat us to it since we checked for an existing instance + ((ReadOnlyManager) roHandler).cache.dispose(); + roHandler = existing; + } + } + } + + return roHandler; + } + + private static void process(ReadOnlyManager manager, EditingDomain domain) { + Activator.getDefault().getReadOnlyManagerProcessors().forEach(p -> p.processReadOnlyManager(manager, domain)); + } + + protected static class HandlerPriorityPair implements Comparable<HandlerPriorityPair> { + + public Class<?> handlerClass; + + public int priority; + + public Set<ReadOnlyAxis> axes; + + @Override + public int compareTo(HandlerPriorityPair o) { + if (o.priority > priority) { + return 1; + } else if (o.priority < priority) { + return -1; + } else { + return 0; + } + } + } + + protected static final Map<Class<?>, Set<ReadOnlyAxis>> orderedHandlerClasses; + + static { + IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.emf.readonly", "readOnlyHandler"); + + List<HandlerPriorityPair> handlerPriorityPairs = new LinkedList<HandlerPriorityPair>(); + Map<String, HandlerPriorityPair> idMap = new HashMap<String, HandlerPriorityPair>(); + + for (IConfigurationElement elem : configElements) { + if ("readOnlyHandler".equals(elem.getName())) { + try { + HandlerPriorityPair handlerPriorityPair = new HandlerPriorityPair(); + String className = elem.getAttribute("class"); + handlerPriorityPair.handlerClass = Platform.getBundle(elem.getContributor().getName()).loadClass(className); + + handlerPriorityPair.priority = Integer.parseInt(elem.getAttribute("priority")); + + IConfigurationElement[] affinities = elem.getChildren("affinity"); + if ((affinities == null) || (affinities.length == 0)) { + // implicit affinity is with any axis + handlerPriorityPair.axes = ReadOnlyAxis.anyAxis(); + } else { + handlerPriorityPair.axes = EnumSet.noneOf(ReadOnlyAxis.class); + for (IConfigurationElement next : affinities) { + handlerPriorityPair.axes.add(ReadOnlyAxis.valueOf(next.getAttribute("axis").toUpperCase())); + } + } + + String id = elem.getAttribute("id"); + if (id != null) { + // if any then the handler could be overrided by another registration + HandlerPriorityPair oldHandler = idMap.get(id); + if (oldHandler == null) { + idMap.put(id, handlerPriorityPair); + handlerPriorityPairs.add(handlerPriorityPair); + } else { + if (oldHandler.priority < handlerPriorityPair.priority) { + handlerPriorityPairs.remove(oldHandler); + handlerPriorityPairs.add(handlerPriorityPair); + } + } + } else { + // If none the handler can not be overrided + handlerPriorityPairs.add(handlerPriorityPair); + } + } catch (Throwable t) { + // FIXME: We need to catch Throwables because we rely on external contributions. It is required to also catch Errors (such as compilation errors). + // Move this code to an initialization method, because if a throwable is not caught, this will prevent the whole class initialization + Activator.log.error(t); + } + } + } + + Collections.sort(handlerPriorityPairs); + + orderedHandlerClasses = new LinkedHashMap<Class<?>, Set<ReadOnlyAxis>>(); + + for (HandlerPriorityPair next : handlerPriorityPairs) { + orderedHandlerClasses.put(next.handlerClass, next.axes); + } + } + + + @SuppressWarnings("deprecation") + protected static IReadOnlyHandler2 create(final Class<?> handlerClass, EditingDomain editingDomain) { + boolean isEditingDomainConstructor = true; + Constructor<?> constructor = null; + try { + constructor = handlerClass.getConstructor(EditingDomain.class); + if (constructor == null) { + isEditingDomainConstructor = false; + constructor = handlerClass.getConstructor(); + } + + if (IReadOnlyHandler2.class.isAssignableFrom(constructor.getDeclaringClass())) { + if (isEditingDomainConstructor) { + return (IReadOnlyHandler2) constructor.newInstance(editingDomain); + } else { + return (IReadOnlyHandler2) constructor.newInstance(); + } + } else if (IReadOnlyHandler.class.isAssignableFrom(constructor.getDeclaringClass())) { + if (isEditingDomainConstructor) { + return AbstractReadOnlyHandler.adapt((IReadOnlyHandler) constructor.newInstance(editingDomain), editingDomain); + } else { + return AbstractReadOnlyHandler.adapt((IReadOnlyHandler) constructor.newInstance(), editingDomain); + } + } else if (org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler.class.isAssignableFrom(constructor.getDeclaringClass())) { + return new OldStyleHandlerAdapter((org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler) constructor.newInstance(), editingDomain); + } + } catch (Exception e) { + } + + return null; + } + + protected Map<ReadOnlyAxis, IReadOnlyHandler2[]> orderedHandlersByAxis; + + public ReadOnlyManager(final EditingDomain editingDomain) { + // Create our transaction cache + cache = ReadOnlyCache.create(this, Activator.getDefault().getReadOnlyCacheExecutor()); + + final Map<ReadOnlyAxis, List<IReadOnlyHandler2>> handlers = new EnumMap<ReadOnlyAxis, List<IReadOnlyHandler2>>(ReadOnlyAxis.class); + cache.run(new Runnable() { + + @Override + public void run() { + for (Map.Entry<Class<?>, Set<ReadOnlyAxis>> roClass : orderedHandlerClasses.entrySet()) { + IReadOnlyHandler2 h = create(roClass.getKey(), editingDomain); + if (h != null) { + h.addReadOnlyListener(getForwardingListener()); + + for (ReadOnlyAxis axis : roClass.getValue()) { + List<IReadOnlyHandler2> list = handlers.get(axis); + if (list == null) { + list = new ArrayList<IReadOnlyHandler2>(); + handlers.put(axis, list); + } + list.add(h); + } + } + } + } + }); + + // Iterate the enumeration to make sure all axes are represented (even if only by an empty array) + orderedHandlersByAxis = new EnumMap<ReadOnlyAxis, IReadOnlyHandler2[]>(ReadOnlyAxis.class); + for (ReadOnlyAxis axis : ReadOnlyAxis.values()) { + List<IReadOnlyHandler2> list = handlers.get(axis); + if (list == null) { + orderedHandlersByAxis.put(axis, new IReadOnlyHandler2[0]); + } else { + orderedHandlersByAxis.put(axis, list.toArray(new IReadOnlyHandler2[list.size()])); + } + } + } + + @Override + public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) { + final Set<URI> uriSet = ImmutableSet.copyOf(uris); + Optional<Boolean> result = cache.getResources(axes, uriSet); + if (result == null) { + result = Optional.absent(); + + ReadOnlyAxis[] all = ReadOnlyAxis.values(); + for (int i = 0; (i < all.length) && !result.or(Boolean.FALSE); i++) { + if (axes.contains(all[i])) { + result = anyReadOnly(all[i], uris); + } + } + + cache.putResources(axes, uriSet, result); + } + + return result.isPresent() ? result : Optional.of(Boolean.FALSE); + } + + private Optional<Boolean> anyReadOnly(ReadOnlyAxis axis, URI[] uris) { + final Set<URI> uriSet = ImmutableSet.copyOf(uris); + Set<ReadOnlyAxis> axes = axis.singleton(); + Optional<Boolean> result = cache.getResources(axes, uriSet); + if (result == null) { + result = Optional.absent(); + + IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis); + for (int i = 0; (i < orderedHandlers.length) && !result.isPresent(); i++) { + result = orderedHandlers[i].anyReadOnly(axes, uris); + } + + cache.putResources(axes, uriSet, result); + } + + return result.isPresent() ? result : Optional.of(Boolean.FALSE); + } + + @Override + public Optional<Boolean> isReadOnly(Set<ReadOnlyAxis> axes, EObject eObject) { + Optional<Boolean> result = cache.getObject(axes, eObject); + if (result == null) { + result = Optional.absent(); + + ReadOnlyAxis[] all = ReadOnlyAxis.values(); + for (int i = 0; (i < all.length) && !result.or(Boolean.FALSE); i++) { + if (axes.contains(all[i])) { + result = isReadOnly(all[i], eObject); + } + } + + cache.putObject(axes, eObject, result); + } + + return result.isPresent() ? result : Optional.of(Boolean.FALSE); + } + + private Optional<Boolean> isReadOnly(ReadOnlyAxis axis, EObject eObject) { + Set<ReadOnlyAxis> axes = axis.singleton(); + Optional<Boolean> result = cache.getObject(axes, eObject); + if (result == null) { + result = Optional.absent(); + + IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis); + for (int i = 0; (i < orderedHandlers.length) && !result.isPresent(); i++) { + result = orderedHandlers[i].isReadOnly(axes, eObject); + } + + cache.putObject(axes, eObject, result); + } + + return result.isPresent() ? result : Optional.of(Boolean.FALSE); + } + + @Override + public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) { + Boolean finalResult = true; + + ReadOnlyAxis[] all = ReadOnlyAxis.values(); + for (int i = 0; (i < all.length) && finalResult; i++) { + if (axes.contains(all[i])) { + finalResult = makeWritable(all[i], uris); + } + } + + return Optional.of(finalResult); + } + + private Boolean makeWritable(ReadOnlyAxis axis, URI[] uris) { + Set<ReadOnlyAxis> axes = axis.singleton(); + Boolean finalResult = true; + + try { + IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis); + for (int i = 0; (i < orderedHandlers.length); i++) { + Optional<Boolean> isRO = orderedHandlers[i].anyReadOnly(axes, uris); + if (isRO.or(Boolean.FALSE)) { + Optional<Boolean> result = orderedHandlers[i].makeWritable(axes, uris); + // makeWritable should provide an answer since anyReadOnly returned a positive value. + // If no answer consider it a failure + if (!result.or(Boolean.FALSE)) { + finalResult = false; + break; + } + } + } + } finally { + cache.clear(); + } + + return finalResult; + } + + @Override + public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, EObject eObject) { + Boolean finalResult = true; + + ReadOnlyAxis[] all = ReadOnlyAxis.values(); + for (int i = 0; (i < all.length) && finalResult; i++) { + if (axes.contains(all[i])) { + finalResult = makeWritable(all[i], eObject); + } + } + + return Optional.of(finalResult); + } + + private Boolean makeWritable(ReadOnlyAxis axis, EObject eObject) { + Set<ReadOnlyAxis> axes = axis.singleton(); + Boolean finalResult = true; + + try { + IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis); + for (int i = 0; (i < orderedHandlers.length); i++) { + Optional<Boolean> isRO = orderedHandlers[i].isReadOnly(axes, eObject); + if (isRO.or(Boolean.FALSE)) { + Optional<Boolean> result = orderedHandlers[i].makeWritable(axes, eObject); + // makeWritable should provide an answer since anyReadOnly returned a positive value + // if no answer consider it a failure + if (!result.or(Boolean.FALSE)) { + finalResult = false; + break; + } + } + } + } finally { + cache.clear(); + } + + return finalResult; + } + + @Override + public Optional<Boolean> canMakeWritable(Set<ReadOnlyAxis> axes, URI[] uris) { + Boolean result = false; + + ReadOnlyAxis[] all = ReadOnlyAxis.values(); + for (int i = 0; (i < all.length) && !result; i++) { + if (axes.contains(all[i])) { + result = canMakeWritable(all[i], uris); + } + } + + return Optional.of(result); + } + + private Boolean canMakeWritable(ReadOnlyAxis axis, URI[] uris) { + Set<ReadOnlyAxis> axes = axis.singleton(); + Boolean result = false; + + IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis); + for (int i = 0; (i < orderedHandlers.length); i++) { + if (orderedHandlers[i].anyReadOnly(axes, uris).or(false)) { + // Only ask a handler about making writable what it considers to be read-only + Optional<Boolean> canMakeWritable = orderedHandlers[i].canMakeWritable(axes, uris); + if (canMakeWritable.isPresent()) { + result = canMakeWritable.get(); + break; + } + } + } + + return result; + } + + @Override + public Optional<Boolean> canMakeWritable(Set<ReadOnlyAxis> axes, EObject object) { + Boolean result = false; + + ReadOnlyAxis[] all = ReadOnlyAxis.values(); + for (int i = 0; (i < all.length) && !result; i++) { + if (axes.contains(all[i])) { + result = canMakeWritable(all[i], object); + } + } + + return Optional.of(result); + } + + private Boolean canMakeWritable(ReadOnlyAxis axis, EObject object) { + Set<ReadOnlyAxis> axes = axis.singleton(); + Boolean result = false; + + IReadOnlyHandler2[] orderedHandlers = orderedHandlersByAxis.get(axis); + for (int i = 0; (i < orderedHandlers.length); i++) { + if (orderedHandlers[i].isReadOnly(axes, object).or(false)) { + // Only ask a handler about making writable what it considers to be read-only + Optional<Boolean> canMakeWritable = orderedHandlers[i].canMakeWritable(axes, object); + if (canMakeWritable.isPresent()) { + result = canMakeWritable.get(); + break; + } + } + } + + return result; + } + + @Override + public void addReadOnlyListener(IReadOnlyListener listener) { + listeners.addIfAbsent(listener); + } + + @Override + public void removeReadOnlyListener(IReadOnlyListener listener) { + listeners.remove(listener); + } + + private IReadOnlyListener getForwardingListener() { + if (forwardingListener == null) { + forwardingListener = new IReadOnlyListener() { + + @Override + public void readOnlyStateChanged(ReadOnlyEvent event) { + ReadOnlyEvent myEvent; + + switch (event.getEventType()) { + case ReadOnlyEvent.OBJECT_READ_ONLY_STATE_CHANGED: + myEvent = new ReadOnlyEvent(ReadOnlyManager.this, event.getAxis(), event.getObject(), event.isReadOnly()); + break; + default: + myEvent = new ReadOnlyEvent(ReadOnlyManager.this, event.getAxis(), event.getResourceURI(), event.isReadOnly()); + break; + } + + notifyReadOnlyStateChanged(myEvent); + } + }; + } + + return forwardingListener; + } + + protected void notifyReadOnlyStateChanged(ReadOnlyEvent event) { + if (!listeners.isEmpty()) { + for (IReadOnlyListener next : listeners) { + try { + next.readOnlyStateChanged(event); + } catch (Exception e) { + Activator.log.error("Uncaught exception in read-only state change listener.", e); //$NON-NLS-1$ + } + } + } + } + + /** + * Obtains a snapshot of the read-only handlers currently registered with me. + * + * @return my read-only handlers, by axis of affiliation. Changes to this collection + * do not affect my registered handlers + * @since 2.0 + */ + public final Map<ReadOnlyAxis, Collection<IReadOnlyHandler2>> getReadOnlyHandlers() { + Map<ReadOnlyAxis, Collection<IReadOnlyHandler2>> result = new HashMap<>(); + + // Be sure not to provide lists that are actually backed by the arrays! + orderedHandlersByAxis.forEach((axis, handlers) -> result.put(axis, Lists.newArrayList(handlers))); + + return result; + } + + // + // Deprecated API + // + + @Override + @Deprecated + public Optional<Boolean> anyReadOnly(URI[] uris) { + return anyReadOnly(permissionAxes(), uris); + } + + @Override + @Deprecated + public Optional<Boolean> isReadOnly(EObject eObject) { + return isReadOnly(permissionAxes(), eObject); + } + + @Override + @Deprecated + public Optional<Boolean> makeWritable(URI[] uris) { + return makeWritable(permissionAxes(), uris); + } + + @Override + @Deprecated + public Optional<Boolean> makeWritable(EObject eObject) { + return makeWritable(permissionAxes(), eObject); + } + + // + // Legacy adapters + // + + @SuppressWarnings("deprecation") + private static final class OldStyleHandlerAdapter extends AbstractReadOnlyHandler { + + private final org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler delegate; + + OldStyleHandlerAdapter(org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler handler, EditingDomain editingDomain) { + super(editingDomain); + + this.delegate = handler; + } + + @Override + public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) { + + // the old API contract is that handlers only return true if they + // know it to be true, because the manager takes the first positive + // answer. Moreover, they only dealt with permission-based read-only-ness + boolean delegateResult = axes.contains(ReadOnlyAxis.PERMISSION) && delegate.isReadOnly(uris, getEditingDomain()); + return delegateResult ? Optional.of(Boolean.TRUE) : Optional.<Boolean> absent(); + } + + @Override + public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) { + + // the old API contract is that handlers only return false if they + // tried to but could not make the resources writable, because the + // manager takes the first negative answer (this is opposite to the + // isReadOnly logic). Moreover, they only dealt with permission-based + // read-only-ness + boolean delegateResult = axes.contains(ReadOnlyAxis.PERMISSION) && delegate.enableWrite(uris, getEditingDomain()); + return delegateResult ? Optional.<Boolean> absent() : Optional.of(Boolean.FALSE); + } + } +} diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/spi/IReadOnlyManagerProcessor.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/spi/IReadOnlyManagerProcessor.java index e56620c8fec..9fa0c779ada 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/spi/IReadOnlyManagerProcessor.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/spi/IReadOnlyManagerProcessor.java @@ -18,7 +18,7 @@ import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager; /** * <p> - * An OSGi service interface for hooks to process the a new {@link ReadOnlyManager} + * An OSGi service interface for hooks to process a new {@link ReadOnlyManager} * upon its creation. There is no special provision for notification of when the * manager is no longer being used. * </p> @@ -26,6 +26,8 @@ import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager; * Any number of of implementations of this service may be registered; all will be * invoked for each read-only manager. * </p> + * + * @since 2.0 */ @FunctionalInterface public interface IReadOnlyManagerProcessor { diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.project index 739a883bc87..6d2edc9f146 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF index f1b58b7d9dd..eb196ce4666 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF @@ -2,25 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceEditPlugin$Implementation -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.papyrus.infra.constraints;visibility:=reexport, - org.eclipse.papyrus.infra.types;visibility:=reexport, - org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.infra.properties;visibility:=reexport, - org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.papyrus.infra.types.edit;visibility:=reexport, - org.eclipse.papyrus.infra.properties.edit;visibility:=reexport, - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.views.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.types.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml index d7e09280b23..4debef138e1 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.types.ui</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.project index 6c62ecfe762..2270d511be4 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.types</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.types</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF index d56fcb5df95..76a601a2ec2 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF @@ -1,43 +1,27 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.infra.types;visibility:=reexport,
- org.eclipse.papyrus.infra.types.rulebased;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;visibility:=reexport,
- org.eclipse.papyrus.infra.types;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.papyrus.infra.properties;visibility:=reexport,
- org.eclipse.papyrus.infra.types.rulebased;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.emf.types,
- org.eclipse.papyrus.infra.emf.types.advices.values,
- org.eclipse.papyrus.infra.emf.types.advices.values.impl,
- org.eclipse.papyrus.infra.emf.types.advices.values.provider,
- org.eclipse.papyrus.infra.emf.types.advices.values.util,
- org.eclipse.papyrus.infra.emf.types.converter,
- org.eclipse.papyrus.infra.emf.types.rules.container,
- org.eclipse.papyrus.infra.emf.types.rules.container.impl,
- org.eclipse.papyrus.infra.emf.types.rules.container.provider,
- org.eclipse.papyrus.infra.emf.types.rules.container.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.emf.types.rules.container.provider.InvariantContainerRuleEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.emf.types, + org.eclipse.papyrus.infra.emf.types.advices.values, + org.eclipse.papyrus.infra.emf.types.advices.values.impl, + org.eclipse.papyrus.infra.emf.types.advices.values.provider, + org.eclipse.papyrus.infra.emf.types.advices.values.util, + org.eclipse.papyrus.infra.emf.types.converter, + org.eclipse.papyrus.infra.emf.types.rules.container, + org.eclipse.papyrus.infra.emf.types.rules.container.impl, + org.eclipse.papyrus.infra.emf.types.rules.container.provider, + org.eclipse.papyrus.infra.emf.types.rules.container.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.emf.types.rules.container.provider.InvariantContainerRuleEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml index a3299c0e10a..ea2d92d93e0 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.types</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.project index 2e261c7b71c..a79b6ba3e7f 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.project @@ -1,28 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF index f79d3178a14..ea5faf931d5 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF @@ -1,28 +1,24 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.emf,
- org.eclipse.papyrus.infra.emf.adapters,
- org.eclipse.papyrus.infra.emf.advice,
- org.eclipse.papyrus.infra.emf.commands,
- org.eclipse.papyrus.infra.emf.edit.domain,
- org.eclipse.papyrus.infra.emf.requests,
- org.eclipse.papyrus.infra.emf.resource,
- org.eclipse.papyrus.infra.emf.resource.index,
- org.eclipse.papyrus.infra.emf.spi.resolver,
- org.eclipse.papyrus.infra.emf.utils
-Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.400",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: EMF Tools
-Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.emf, + org.eclipse.papyrus.infra.emf.adapters, + org.eclipse.papyrus.infra.emf.advice, + org.eclipse.papyrus.infra.emf.commands, + org.eclipse.papyrus.infra.emf.edit.domain, + org.eclipse.papyrus.infra.emf.requests, + org.eclipse.papyrus.infra.emf.resource, + org.eclipse.papyrus.infra.emf.resource.index, + org.eclipse.papyrus.infra.emf.spi.resolver, + org.eclipse.papyrus.infra.emf.utils +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: EMF Tools +Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml index cc4360ddd2d..afbd61aedc8 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java index a3c0e69cc06..0698bdea266 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java @@ -121,6 +121,7 @@ public class Activator extends Plugin { * Obtain the instance of the {@link EObject} resolver service, if any. * * @return the object resolver service (never {@code null} while this bundle is active) + * @since 2.0 */ public IEObjectResolver getEObjectResolver() { return resolverService; diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java index dd9f1e67d95..1892e863144 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java @@ -19,6 +19,8 @@ import org.osgi.framework.BundleContext; /** * A resolver that delegates to registered OSGi services in a <em>Chain of Command</em> * pattern to provide the first available service result. + * + * @since 2.0 */ public class EObjectResolverService implements IEObjectResolver { private final CompositeServiceTracker<IEObjectResolver> tracker; diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/IEObjectResolver.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/IEObjectResolver.java index 8f968d2db5e..82bf50aacb0 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/IEObjectResolver.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/IEObjectResolver.java @@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.EObject; * A service interface for resolution of the {@linkplain EObject EMF object} wrapped * in an EMF Facet content-provider node or anything else that doesn't implement * the usual {@link IAdaptable} protocol with respect to provision of an {@link EObject}. + * + * @since 2.0 */ @FunctionalInterface public interface IEObjectResolver { diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java index feef59d314d..bd806fec1c2 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java @@ -1,1122 +1,1124 @@ -/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - filter out EObjects that are Resources (CDO)
- * Christian W. Damus (CEA) - Support read-only state at object level (CDO)
- * Christian W. Damus (CEA) - bugs 323802, 429826, 408491, 432813, 422257
- * Christian W. Damus - bugs 469188, 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.emf.utils;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;
-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.emf.Activator;
-import org.eclipse.papyrus.infra.tools.util.PlatformHelper;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-
-/**
- * A Helper class for manipulating EMF Objects
- *
- * @author Camille Letavernier
- */
-// TODO : Check implementations. Most of them are old and don't always match the specification
-public class EMFHelper {
-
- /**
- * Returns the EClass corresponding to the given nsUri and className
- *
- * @param nsUri
- * The NSURI of the EClass' EPackage
- * @param className
- * The EClass' name
- * @return
- * The EClass instance, or null if the EClass couldn't be found
- */
- public static EClass getEClass(final String nsUri, final String className) {
- EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsUri);
- if (ePackage == null) {
- Activator.log.warn("Cannot find an EPackage matching the nsURI " + nsUri); //$NON-NLS-1$
- return null;
- }
- return getEClass(ePackage, className);
- }
-
- /**
- * Return the EClass corresponding to the given EPackage and className
- *
- * @param metamodel
- * The EClass' EPackage
- * @param className
- * The EClass' name
- * @return
- * The EClass instance, or null if the EClass couldn't be found
- */
- public static EClass getEClass(final EPackage metamodel, final String className) {
- EClassifier classifier = metamodel.getEClassifier(className);
- if (classifier == null) {
- Activator.log.warn("Classifier " + className + " not found in metamodel " + metamodel.getName() + " (" + metamodel.getNsURI() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
- if (classifier instanceof EClass) {
- return (EClass) classifier;
- } else {
- Activator.log.warn("Classifier " + className + " in " + metamodel.getName() + " (" + metamodel.getNsURI() + ") is not an EClass"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
- return null;
- }
-
- /**
- * Tests if an Object is an instance of the given EClass
- *
- * @param element
- * The EObject to test
- * @param className
- * The name of the EClass
- * @param metamodel
- * The EPackage owning the EClass
- * @return
- * True if the EObject is an instance of the EClass, or of one of the EClass' subtypes
- */
- public static boolean isInstance(final EObject element, final String className, final EPackage metamodel) {
-
- EClassifier theClass = metamodel.getEClassifier(className);
-
- if (theClass == null) {
- String message = String.format("Class %s not found in metamodel: %s (%s)", className, metamodel.getName(), metamodel.getNsURI());//$NON-NLS-1$
- Activator.log.warn(message);
- return false;
- }
-
- return theClass.isInstance(element);
- }
-
-
- /**
- * Tests if an Object is an instance of the given EClass
- *
- * @param element
- * The EObject to test
- * @param className
- * The name of the EClass
- * @param metamodel
- * The URI of the EPackage owning the EClass
- * @return
- * True if the EObject is an instance of the EClass, or of one of the EClass' subtypes
- */
- public static boolean isInstance(EObject selectedItem, String className, String nsUri) {
- EClass actualEClass = selectedItem.eClass();
-
- // Exact match
- if (isExactMatch(actualEClass, className, nsUri)) {
- return true;
- }
-
- List<EClass> allSuperTypes = actualEClass.getEAllSuperTypes();
- for (EClass eClass : allSuperTypes) {
- if (isExactMatch(eClass, className, nsUri)) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Tests whether the given EClass has the given className and belongs to the EPackage represented by nsUri
- *
- * @param eClass
- * The EClass to test
- * @param className
- *
- * @param nsUri
- * @return
- * True if the EClass' name is className and the EClass' EPackage's nsURI is nsUri
- */
- private static boolean isExactMatch(EClass eClass, String className, String nsUri) {
- return className.equals(eClass.getName()) && nsUri.equals(eClass.getEPackage().getNsURI());
- }
-
- /**
- * Tests if the given eClass is a Subclass of fromClass
- * Also returns true when eClass == fromClass
- *
- * @param eClass
- * @param fromClass
- * @return
- * true if eClass is a subclass of fromClass
- */
- public static boolean isSubclass(final EClass eClass, final EClass fromClass) {
- // Everything is an EObject
- if (eClass != null && fromClass == EcorePackage.eINSTANCE.getEObject()) {
- return true;
- }
-
- if (eClass == fromClass) {
- return true;
- }
-
- List<EClass> superTypes = eClass.getEAllSuperTypes();
- if (superTypes.contains(fromClass)) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Returns the EObject corresponding to the input object
- * Tests if the input is an EObject, or if it is Adaptable
- * to an EObject
- *
- * @param source
- * @return An EObject corresponding to the input source, or null
- * if the EObject could not be resolved
- */
- public static EObject getEObject(final Object source) {
-
- // Support for EMF 0.2 CustomizedTree: The TreeElements are IAdaptable, but the
- // EObject adapter for some of them (e.g. reference node) is not what we need
- Object resolved = Activator.getDefault().getEObjectResolver().resolve(source);
- if ((resolved != source) && isEMFModelElement(resolved)) {
- return (EObject) resolved;
- }
-
- // General case
- if (isEMFModelElement(source)) {
- return (EObject) source;
- }
-
- // Try to get an intrinsic adapter
- if (source instanceof IAdaptable) {
- EObject eObject = ((IAdaptable) source).getAdapter(EObject.class);
- if (eObject == null) { // EMF Facet 0.1
- eObject = ((IAdaptable) source).getAdapter(EReference.class);
- }
-
- if (eObject != null) {
- return asEMFModelElement(eObject); // in case the adapter is a CDOResource
- }
- }
-
- // External adapter (last ditch case)
- if (source != null) {
- return asEMFModelElement(Platform.getAdapterManager().getAdapter(source, EObject.class));
- }
-
- return null;
- }
-
- /**
- * Queries whether an {@code object} is an EMF model element, an instance of
- * some {@link EClass} from an EMF model. This isn't as simple as checking
- * whether the object is an {@link EObject} because there are edge cases
- * where objects are {@code EObject}s but shouldn't be treated as
- * "model content". But, a minimum requirement is that the {@code object} is
- * an {@link EObject}.
- *
- * @param object
- * an object
- * @return whether it is "model content"
- *
- * @see EMFHelper#asEMFModelElement(Object)
- */
- public static boolean isEMFModelElement(Object object) {
- return (object instanceof EObject) && !(object instanceof Resource);
- }
-
- /**
- * Casts an {@code object} as an EMF model element, if appropriate.
- *
- * @param object
- * an object
- * @return the object as an EMF model element, or {@code null} if it is not
- * an EMF model element
- *
- * @see #isEMFModelElement(Object)
- */
- public static EObject asEMFModelElement(Object object) {
- return isEMFModelElement(object) ? (EObject) object : null;
- }
-
- /**
- * Retrieve the EditingDomain for the given source object. The object is first
- * resolved to an EObject through #getEObject when possible.
- *
- * @param source
- * @return
- * The source object's editing domain, or null if it couldn't be found
- */
- public static EditingDomain resolveEditingDomain(final Object source) {
- return resolveEditingDomain(getEObject(source));
- }
-
- /**
- * Retrieve the EditingDomain for the given source EObject
- *
- * @param source
- * @return
- * The source eObject's editing domain, or null if it couldn't be found
- */
- public static EditingDomain resolveEditingDomain(final EObject source) {
- EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source);
- if (domain == null) {
- try {
- domain = ServiceUtils.getInstance().getTransactionalEditingDomain(null);
- } catch (ServiceException e) {
- // Ignore: We cannot find the domain
- }
- }
- return domain;
- }
-
- /**
- * Return the eClassifier' qualified name. The qualified name is obtained by the concatenation
- * of its package hierarchy with the class name, separated by the given separator
- *
- * @param eClassifier
- * @param separator
- * The separator used between each package name
- * @return
- * The EClassifier' qualified name
- */
- public static String getQualifiedName(final EClassifier eClassifier, final String separator) {
- return getQualifiedName(eClassifier.getEPackage(), separator) + separator + eClassifier.getName();
- }
-
- /**
- * Return the ePackage's qualified name. The qualified name is obtained by the concatenation
- * of its superPackage hierarchy with the ePackage name, separated by the given separator
- *
- * @param ePackage
- * @param separator
- * The separator used between each package name
- * @return
- * The EPackage's qualified name
- */
- public static String getQualifiedName(final EPackage ePackage, final String separator) {
- if (ePackage.getESuperPackage() == null) {
- return ePackage.getName();
- }
- return getQualifiedName(ePackage.getESuperPackage(), separator) + separator + ePackage.getName();
- }
-
-
- /**
- * Loads and returns the first EObject at the given URI.
- * The EObject is loaded in the given resourceSet.
- *
- * @param resourceSet
- * The ResourceSet in which the model will be loaded
- * @param uri
- * The URI describing the location of the model to load
- * @return
- * The first EObject located at the given URI
- * @throws IOException
- * When the URI cannot be loaded
- */
- public static EObject loadEMFModel(ResourceSet resourceSet, final URI uri) throws IOException {
- assert resourceSet != null : "null resourceSet"; //$NON-NLS-1$
- if (resourceSet == null) {
- Activator.log.warn("Created a new resourceSet to load an EMF model in " + Activator.log.getCallerMethod()); //$NON-NLS-1$
- resourceSet = new ResourceSetImpl();
- }
-
- try {
- Resource resource = resourceSet.getResource(uri, true);
- if (resource != null) {
- if (!resource.getContents().isEmpty()) {
- return resource.getContents().get(0);
- }
- }
- } catch (Exception ex) {
- IOException exception = new IOException(ex.toString());
- exception.initCause(ex);
- throw exception;
- }
-
- return null;
- }
-
- /**
- * Completely unloads a resource set so that it and all the models it contained may be reclaimed by the
- * Java garbage collector. This includes, at least:
- * <ul>
- * <li>unloading all resources in the set, which converts all model elements to proxies and removes all adapters from them</li>
- * <li>removing all resources from the set</li>
- * <li>removing all adapters from all resources</li>
- * <li>removing all adapters from the resource set</li>
- * </ul>
- *
- * @param resourceSet
- * the resource set to purge
- */
- public static void unload(ResourceSet resourceSet) {
- List<Resource> resources = ImmutableList.copyOf(resourceSet.getResources());
- resourceSet.getResources().clear();
- for (Resource next : resources) {
- next.unload();
- next.eAdapters().clear();
- }
- resourceSet.eAdapters().clear();
-
- // Clear the package registry (it may contain dynamic profile EPackages that we don't
- // want to leak in BasicExtendedMetaData instances attached to static EPackages)
- // Works around EMF bug 433108
- EPackage.Registry packageRegistry = resourceSet.getPackageRegistry();
- if (packageRegistry != null) {
- packageRegistry.clear();
- }
- }
-
- /**
- * Return the root package containing the given package, or the package
- * itself if it is already the root
- *
- * @param ePackage
- * @return
- * The Root package
- */
- public static EPackage getRootPackage(final EPackage ePackage) {
- if (ePackage == null) {
- return null;
- }
-
- if (ePackage.getESuperPackage() == null) {
- return ePackage;
- }
- return getRootPackage(ePackage.getESuperPackage());
- }
-
- /**
- * Gets the object of a given {@code type} containing an {@code object}, or the
- * {@code object} itself if it is of that {@code type}.
- *
- * @param object
- * the object for which to search for a container
- * @param type
- * the type of container to find
- *
- * @return the container of the requested {@code type}, or {@code null} if none
- */
- public static <T extends EObject> T getContainer(EObject object, EClass type) {
- T result = null;
-
- for (EObject next = object; (next != null) && (result == null); next = next.eContainer()) {
- if (type.isInstance(next)) {
- @SuppressWarnings("unchecked")
- T nextAsT = (T) next;
- result = nextAsT;
- }
- }
-
- return result;
- }
-
- /**
- * Gets the object of a given {@code type} containing an {@code object}, or the
- * {@code object} itself if it is of that {@code type}.
- *
- * @param object
- * the object for which to search for a container
- * @param type
- * the type of container to find
- *
- * @return the container of the requested {@code type}, or {@code null} if none
- */
- public static <T extends EObject> T getContainer(EObject object, Class<T> type) {
- T result = null;
-
- for (EObject next = object; (next != null) && (result == null); next = next.eContainer()) {
- if (type.isInstance(next)) {
- result = type.cast(next);
- }
- }
-
- return result;
- }
-
- /**
- * Return the list of EClasses that are subtypes
- * of the given EClass
- *
- * @param type
- * @param concreteClassesOnly
- * If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered
- * @return
- * The list of EClasses implementing or extending the given EClass
- */
- public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly) {
- Set<EClass> result = new LinkedHashSet<EClass>();
- if (!concreteClassesOnly || (!type.isAbstract() && !type.isInterface())) {
- result.add(type);
- }
-
- EPackage ePackage = getRootPackage(type.getEPackage());
- getSubclassesOf(type, ePackage, result, concreteClassesOnly);
- return new LinkedList<EClass>(result);
- }
-
- /**
- * Return the list of EClasses that are sub types
- * of the given EClass
- *
- * @param type
- * @param concreteClassesOnly
- * If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered
- * @param packagesToBrowse
- * The EPackages in which the EClasses should be retrieved
- * @return
- * The list of EClasses implementing or extending the given EClass
- */
- public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly, Collection<EPackage> packagesToBrowse) {
- Set<EClass> result = new LinkedHashSet<EClass>();
- if (!concreteClassesOnly || (!type.isAbstract() && !type.isInterface())) {
- result.add(type);
- }
-
- for (EPackage ePackage : packagesToBrowse) {
- getSubclassesOf(type, ePackage, result, concreteClassesOnly);
- }
-
- return new LinkedList<EClass>(result);
- }
-
- /**
- * Return the list of EClasses that are sub types of the given EClass
- *
- * @param type
- * @param concreteClassesOnly
- * If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered
- * @param browseAllRegisteredPackages
- * If true, all registered EPackages will be navigated to retrieve the matching EClasses. Otherwise,
- * only the current EPackage will be used.
- * @return
- * The list of EClasses implementing or extending the given EClass
- */
- public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly, final boolean browseAllRegisteredPackages) {
- // If the current package is a dynamic package, it may not be registered (?). Add it directly
- EPackage currentPackage = getRootPackage(type.getEPackage());
-
- Set<EPackage> allPackages = new LinkedHashSet<EPackage>();
- allPackages.add(currentPackage);
-
- if (browseAllRegisteredPackages) {
- // FIXME // WARNING: This loop will load all EPackages. The first call is expensive.
- Set<String> allUris = new HashSet<String>(EPackage.Registry.INSTANCE.keySet());
-
- for (String nsURI : allUris) {
- allPackages.add(EPackage.Registry.INSTANCE.getEPackage(nsURI));
- }
- }
-
- return getSubclassesOf(type, concreteClassesOnly, allPackages);
- }
-
- private static void getSubclassesOf(final EClass type, final EPackage fromPackage, final Set<EClass> result, final boolean concreteClassesOnly) {
- for (EClassifier classifier : fromPackage.getEClassifiers()) {
- if (classifier instanceof EClass) {
- EClass eClass = (EClass) classifier;
- if (eClass.getEAllSuperTypes().contains(type)) {
- if (!concreteClassesOnly || (!eClass.isAbstract() && !eClass.isInterface())) {
- result.add(eClass);
- }
- }
- }
- }
-
- for (EPackage subPackage : fromPackage.getESubpackages()) {
- getSubclassesOf(type, subPackage, result, concreteClassesOnly);
- }
- }
-
- /**
- * Tests if an EObject is read only on any {@linkplain ReadOnlyAxis axis}.
- * Delegates to the EObject's editing domain if it can be found
- *
- * @param eObject
- * @return
- * True if the EObject is read only on any axis
- * @see #isReadOnly(Set, EObject, EditingDomain)
- */
- public static boolean isReadOnly(final EObject eObject) {
- return isReadOnly(ReadOnlyAxis.anyAxis(), eObject);
- }
-
- /**
- * Tests if an EObject is read only on any of the specified {@code axes}.
- * Delegates to the EObject's editing domain if it can be found
- *
- * @param axes
- * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful
- * @param eObject
- * @return
- * True if the EObject is read only on any of the given {@code axes}
- */
- public static boolean isReadOnly(Set<ReadOnlyAxis> axes, final EObject eObject) {
- EditingDomain domain = resolveEditingDomain(eObject);
- return isReadOnly(axes, eObject, domain);
- }
-
- /**
- * Tests if an EObject is read only on any {@linkplain ReadOnlyAxis axis}.
- * Delegates to the given editing domain if it isn't null
- *
- * @param eObject
- * @param domain
- * @return
- * True if the EObject is read only on any axis
- */
- public static boolean isReadOnly(final EObject eObject, final EditingDomain domain) {
- return isReadOnly(ReadOnlyAxis.anyAxis(), eObject, domain);
- }
-
- /**
- * Tests if an EObject is read only on any of the specified {@code axes}.
- * Delegates to the given editing domain if it isn't null
- *
- * @param axes
- * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful
- * @param eObject
- *
- * @param domain
- * @return
- * True if the EObject is read only
- */
- public static boolean isReadOnly(Set<ReadOnlyAxis> axes, final EObject eObject, final EditingDomain domain) {
- if (domain != null) {
- Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class);
- if (handler instanceof IReadOnlyHandler2) {
- return ((IReadOnlyHandler2) handler).isReadOnly(axes, eObject).get();
- } else if (handler instanceof IReadOnlyHandler) {
- // these handlers only deal with permission-based read-only-ness
- return axes.contains(ReadOnlyAxis.PERMISSION) && ((IReadOnlyHandler) handler).isReadOnly(eObject).get();
- }
-
- if (eObject.eResource() != null) {
- return domain.isReadOnly(eObject.eResource());
- }
- }
- return false;
- }
-
- /**
- * Tests if the Resource is read only on any {@linkplain ReadOnlyAxis axis}.
- * Delegates to the given editing domain if it isn't null
- *
- * @param resource
- * @param domain
- * @return
- * True if the Resource is read only on any axis
- */
- public static boolean isReadOnly(final Resource resource, final EditingDomain domain) {
- return isReadOnly(ReadOnlyAxis.anyAxis(), resource, domain);
- }
-
- /**
- * Tests if the Resource is read only on any of the given {@code axes}.
- * Delegates to the given editing domain if it isn't null
- *
- * @param axes
- * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful
- * @param resource
- * @param domain
- * @return
- * True if the Resource is read only on any of the given {@code axes}
- */
- public static boolean isReadOnly(Set<ReadOnlyAxis> axes, final Resource resource, final EditingDomain domain) {
- if (resource == null) {
- return false;
- }
-
- if (domain != null && resource.getURI() != null) {
- Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class);
- if (handler instanceof IReadOnlyHandler2) {
- return ((IReadOnlyHandler2) handler).anyReadOnly(axes, new URI[] { resource.getURI() }).get();
- } else if (handler instanceof IReadOnlyHandler) {
- // these handlers only deal with permission-based read-only-ness
- return axes.contains(ReadOnlyAxis.PERMISSION) && ((IReadOnlyHandler) handler).anyReadOnly(new URI[] { resource.getURI() }).get();
- }
- return domain.isReadOnly(resource);
- }
-
- // no editing domain : use file system attribute
- ResourceSet resourceSet = resource.getResourceSet();
-
- if (resourceSet == null) {
- return false;
- }
-
- Map<String, ?> attributes = resourceSet.getURIConverter().getAttributes(resource.getURI(), null);
- Boolean readOnly = (Boolean) attributes.get(URIConverter.ATTRIBUTE_READ_ONLY);
-
- return readOnly == null ? false : readOnly;
- }
-
- /**
- * Tests if an object that is read only could possibly be made writable by some means (file system attributes, team provider hook, database
- * permissions, etc.)
- *
- * @param eObject
- * an object that is assumed to be read-only
- * @param domain
- * the editing domain context of the {@link eObject}
- * @return
- * whether the {@code eObject} could be made writable
- */
- public static boolean canMakeWritable(final EObject eObject, final EditingDomain domain) {
- return canMakeWritable(ReadOnlyAxis.anyAxis(), eObject, domain);
- }
-
- /**
- * Tests if an object that is read only could possibly be made writable according to any of
- * the specified {@code axes} of read-only-ness.
- *
- * @param axes
- * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful
- * @param eObject
- * an object that is assumed to be read-only
- * @param domain
- * the editing domain context of the {@link eObject}
- * @return
- * whether the {@code eObject} could be made writable
- */
- public static boolean canMakeWritable(Set<ReadOnlyAxis> axes, final EObject eObject, final EditingDomain domain) {
- if (domain != null) {
- Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class);
- if (handler instanceof IReadOnlyHandler2) {
- return ((IReadOnlyHandler2) handler).canMakeWritable(axes, eObject).or(false);
- }
- }
- return false;
- }
-
- /**
- * Tests if a resource that is read only could possibly be made writable by some means (file system attributes, team provider hook, database
- * permissions, etc.)
- *
- * @param resource
- * a resource that is assumed to be read-only
- * @param domain
- * the editing domain context of the {@link resource}
- * @return
- * whether the {@code resource} could be made writable
- */
- public static boolean canMakeWritable(final Resource resource, final EditingDomain domain) {
- return canMakeWritable(ReadOnlyAxis.anyAxis(), resource, domain);
- }
-
- /**
- * Tests if a resource that is read only could possibly be made writable according to any of
- * the specified {@code axes} of read-only-ness.
- *
- * @param axes
- * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful
- * @param resource
- * a resource that is assumed to be read-only
- * @param domain
- * the editing domain context of the {@link resource}
- * @return
- * whether the {@code resource} could be made writable
- */
- public static boolean canMakeWritable(Set<ReadOnlyAxis> axes, final Resource resource, final EditingDomain domain) {
- if (domain != null) {
- Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class);
- if (handler instanceof IReadOnlyHandler2) {
- return ((IReadOnlyHandler2) handler).canMakeWritable(axes, new URI[] { resource.getURI() }).or(false);
- }
- }
- return false;
- }
-
- /**
- * Tests if the given EStructuralFeature is required (ie. should always
- * have a value)
- *
- * A feature is required if at least of one the following conditions if
- * true :
- *
- * - It has a defaultValue
- * - Its lowerBound is at least 1
- * - It is an enumeration (Enumerations always have a default value)
- * - It is a Java primitive type, and is not marked as Unsettable
- *
- * @param feature
- * the feature to test
- * @return
- * true if the feature is required, false otherwise
- */
- public static boolean isRequired(final EStructuralFeature feature) {
- EClassifier eType = feature.getEType();
- if (eType == null) {
- return false;
- }
-
- // EEnums are always required, as an EEnum always has a default value
- if (eType instanceof EEnum) {
- return true;
- }
-
- // At least one value means it is required
- if (feature.getLowerBound() >= 1) {
- return true;
- }
-
- // Java primitive types cannot have a null value
- // if the feature is not specifically marked as unsettable, then it is required
- if (eType.getInstanceClass() != null && eType.getInstanceClass().isPrimitive() && !feature.isUnsettable()) {
- return true;
- }
-
- // If there is a default value, there is always a value
- if (feature.getDefaultValueLiteral() != null) {
- return true;
- }
-
- return false; // The property if not required
- }
-
- /**
- * Returns all objects of type T contained in the resource
- *
- * @param resource
- * @param type
- * @return
- */
- public static <T> Set<T> allInstances(final Resource resource, Class<T> type) {
- TreeIterator<EObject> iterator = resource.getAllContents();
- Set<T> result = new LinkedHashSet<T>();
-
- while (iterator.hasNext()) {
- EObject element = iterator.next();
- if (type.isInstance(element)) {
- result.add(type.cast(element));
- }
- }
-
- return result;
- }
-
- /**
- * Returns all the EPackages and nested EPackages contained in this resource
- *
- * @param resource
- * @return
- */
- public static Set<EPackage> getAllEPackages(final Resource resource) {
- Set<EPackage> result = new LinkedHashSet<EPackage>();
-
- for (EObject rootElement : resource.getContents()) {
- if (rootElement instanceof EPackage) {
- result.add((EPackage) rootElement);
- result.addAll(getAllNestedPackages((EPackage) rootElement));
- }
- }
-
- return result;
- }
-
- /**
- * Returns all packages nested in the given EPackage (recursively). Does not
- * include the base EPackage.
- *
- * @param basePackage
- * @return
- */
- public static Set<EPackage> getAllNestedPackages(EPackage basePackage) {
- Set<EPackage> result = new LinkedHashSet<EPackage>();
-
- for (EPackage nestedPackage : basePackage.getESubpackages()) {
- result.add(nestedPackage);
- result.addAll(getAllNestedPackages(nestedPackage));
- }
-
- return result;
- }
-
- /**
- *
- * @param resource
- * a resource
- *
- * @return
- * the list of the metamodels known by the resource
- */
- public static Set<EPackage> getMetamodels(final Resource resource) {
- Set<EPackage> metamodels = new HashSet<EPackage>();
- if (resource != null) {
- final List<EObject> contents = new ArrayList<EObject>(resource.getContents());
- for (final EObject current : contents) {
- metamodels.add(current.eClass().getEPackage());
- }
- }
- return metamodels;
- }
-
- /**
- *
- * Returns the XMI ID of the given {@link EObject} or <code>null</code> if it cannot be resolved.
- *
- * @param object
- * Object which we seek the XMI ID of.
- * @return <code>object</code>'s XMI ID, <code>null</code> if not applicable.
- */
- public static final String getXMIID(final EObject object) {
- String objectID = null;
- if (object != null && object.eResource() instanceof XMIResource) {
- objectID = ((XMIResource) object.eResource()).getID(object);
- }
- return objectID;
- }
-
-
-
- /**
- * Gets the usages.
- *
- * @param source
- * the source
- *
- * @return the usages or null if there is no usages
- */
- public static Collection<Setting> getUsages(EObject source) {
- // the functional code is defined in core because we need it in infra.core
- // but infra.core can't depend on infra.emf (circular dependency)
- return org.eclipse.papyrus.infra.core.utils.EMFHelper.getUsages(source);
- }
-
-
- /**
- * <pre>
- * Test if the used element is referenced by other elements than the known
- * referencer (except its container). It ignores references from an other meta-model.
- * </pre>
- *
- * @param usedObject
- * the used object
- * @param knownReferencer
- * the known referencer
- * @return true if the known referencer is the only referencer.
- */
- public static boolean isOnlyUsage(EObject usedObject, EObject knownReferencer) {
- boolean isUsed = false;
- EPackage mmPackage = usedObject.eClass().getEPackage();
-
- // Retrieve the list of elements referencing the usedObject.
- Set<EObject> crossReferences = new HashSet<EObject>();
- for (Setting setting : getUsages(usedObject)) {
- EObject eObj = setting.getEObject();
- if (eObj.eClass().getEPackage().equals(mmPackage)) {
- crossReferences.add(eObj);
- }
- }
-
- // Remove the container of used object.
- crossReferences.remove(usedObject.eContainer());
- // Remove the knownReferencer from the list of references.
- crossReferences.remove(knownReferencer);
-
- // If no referencer remains in the list, the known element is the only
- // usage.
- if (crossReferences.isEmpty()) {
- isUsed = true;
- }
-
- return isUsed;
- }
-
- /**
- *
- * @param superType
- * an eclassifier
- * @param subType
- * another eClassifier
- * @return
- * <code>true</code> if the 2nd {@link EClassifier} is a subtype of the first one
- */
- public static boolean isSuperType(final EClassifier superType, final EClassifier subType) {
- if (superType == subType) {
- return true;
- }
-
- if (superType instanceof EClass && subType instanceof EClass) {
- // special case because isSuperTypeOf doesn't handle it
- if (superType == EcorePackage.eINSTANCE.getEObject()) {
- return true;
- }
-
- EClass superTypeEClass = (EClass) superType;
- EClass subTypeEClass = (EClass) subType;
- return superTypeEClass.isSuperTypeOf(subTypeEClass);
- }
-
- // manage EDtataType
- if (superType == EcorePackage.eINSTANCE.getEDataType() && subType instanceof EDataType) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Computes the path from the root EObject to the given element, as a List of EObjects
- *
- * @param element
- * @return
- */
- public static List<EObject> getContainmentPath(EObject element) {
- List<EObject> result;
- if (element.eContainer() == null) {
- result = new LinkedList<EObject>();
- result.add(element);
- return result;
- } else {
- result = getContainmentPath(element.eContainer());
- result.add(element);
- }
- return result;
- }
-
- /**
- * Returns the given element, reloaded into the resource set of the context element,
- * or the source element itself if not possible.
- *
- * Use this method for e.g. loading an element from a shared resource set into another resource set
- * (Apply a registered profile/library, drop an element from the project explorer, ...)
- *
- * @param element
- * @param contextElement
- * @return
- */
- public static <T extends EObject> T reloadIntoContext(T element, EObject contextElement) {
- ResourceSet sourceResourceSet = getResourceSet(element);
- ResourceSet loadingContext = getResourceSet(contextElement);
-
- if (sourceResourceSet == loadingContext || loadingContext == null) {
- return element;
- }
-
- URI sourceURI = EcoreUtil.getURI(element);
- EObject result = loadingContext.getEObject(sourceURI, true);
-
- return (T) result;
- }
-
- /**
- * Returns the resourceSet owning this eObject, or null if it is detached
- *
- * @param eObject
- */
- public static ResourceSet getResourceSet(EObject eObject) {
- Resource resource = (eObject == null) ? null : eObject.eResource();
- return (resource == null) ? null : resource.getResourceSet();
- }
-
- /**
- * Best-effort loads a resource, returning the first root element of the requested {@code type}. Unlike the {@link #loadChecked(ResourceSet, URI, Class) loadChecked} method, this will never throw an exception.
- *
- * @param rset
- * a resource set in which to load the resource
- * @param uri
- * the URI of the resource to load
- * @param type
- * the type of root element to retrieve
- *
- * @return the requested root element, or {@code null} if the resource does not contain such an element or could not be loaded
- *
- * @see #loadChecked(ResourceSet, URI, Class)
- */
- public static <T extends EObject> T load(ResourceSet rset, URI uri, Class<T> type) {
- T result = null;
-
- try {
- result = loadChecked(rset, uri, type);
- } catch (Exception e) {
- Activator.log.error("Exception in loading resource " + uri, e); //$NON-NLS-1$
-
- // Maybe it was partially loaded? If so, try again
- Resource res = rset.getResource(uri, false);
- if ((res != null) && res.isLoaded()) {
- result = Iterables.getFirst(Iterables.filter(res.getContents(), type), null);
- }
- }
-
- return result;
- }
-
- /**
- * Best-effort loads a resource, returning the first root element of the requested {@code type}.
- *
- * @param rset
- * a resource set in which to load the resource
- * @param uri
- * the URI of the resource to load
- * @param type
- * the type of root element to retrieve
- *
- * @return the requested root element, or {@code null} if the resource does not contain such an element or could not be loaded
- * @throws IOException
- * on an I/O problem in loading the resource
- * @throw RuntimeException on any other unforeseen (usually programming error) problem
- *
- * @see #load(ResourceSet, URI, Class)
- */
- public static <T extends EObject> T loadChecked(ResourceSet rset, URI uri, Class<T> type) throws IOException {
- try {
- return Iterables.getFirst(Iterables.filter(rset.getResource(uri, true).getContents(), type), null);
- } catch (WrappedException e) {
- if (e.exception() instanceof IOException) {
- throw (IOException) e.exception();
- } else if (e.exception() instanceof RuntimeException) {
- throw (RuntimeException) e.exception();
- } else {
- throw e;
- }
- }
- }
-}
+/***************************************************************************** + * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, 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: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - filter out EObjects that are Resources (CDO) + * Christian W. Damus (CEA) - Support read-only state at object level (CDO) + * Christian W. Damus (CEA) - bugs 323802, 429826, 408491, 432813, 422257 + * Christian W. Damus - bugs 469188, 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.emf.utils; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.Platform; +import org.eclipse.emf.common.util.TreeIterator; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.common.util.WrappedException; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EEnum; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.EStructuralFeature.Setting; +import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.URIConverter; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.xmi.XMIResource; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler; +import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2; +import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.utils.ServiceUtils; +import org.eclipse.papyrus.infra.emf.Activator; +import org.eclipse.papyrus.infra.tools.util.PlatformHelper; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; + +/** + * A Helper class for manipulating EMF Objects + * + * @author Camille Letavernier + */ +// TODO : Check implementations. Most of them are old and don't always match the specification +public class EMFHelper { + + /** + * Returns the EClass corresponding to the given nsUri and className + * + * @param nsUri + * The NSURI of the EClass' EPackage + * @param className + * The EClass' name + * @return + * The EClass instance, or null if the EClass couldn't be found + */ + public static EClass getEClass(final String nsUri, final String className) { + EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsUri); + if (ePackage == null) { + Activator.log.warn("Cannot find an EPackage matching the nsURI " + nsUri); //$NON-NLS-1$ + return null; + } + return getEClass(ePackage, className); + } + + /** + * Return the EClass corresponding to the given EPackage and className + * + * @param metamodel + * The EClass' EPackage + * @param className + * The EClass' name + * @return + * The EClass instance, or null if the EClass couldn't be found + */ + public static EClass getEClass(final EPackage metamodel, final String className) { + EClassifier classifier = metamodel.getEClassifier(className); + if (classifier == null) { + Activator.log.warn("Classifier " + className + " not found in metamodel " + metamodel.getName() + " (" + metamodel.getNsURI() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } + if (classifier instanceof EClass) { + return (EClass) classifier; + } else { + Activator.log.warn("Classifier " + className + " in " + metamodel.getName() + " (" + metamodel.getNsURI() + ") is not an EClass"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } + + return null; + } + + /** + * Tests if an Object is an instance of the given EClass + * + * @param element + * The EObject to test + * @param className + * The name of the EClass + * @param metamodel + * The EPackage owning the EClass + * @return + * True if the EObject is an instance of the EClass, or of one of the EClass' subtypes + */ + public static boolean isInstance(final EObject element, final String className, final EPackage metamodel) { + + EClassifier theClass = metamodel.getEClassifier(className); + + if (theClass == null) { + String message = String.format("Class %s not found in metamodel: %s (%s)", className, metamodel.getName(), metamodel.getNsURI());//$NON-NLS-1$ + Activator.log.warn(message); + return false; + } + + return theClass.isInstance(element); + } + + + /** + * Tests if an Object is an instance of the given EClass + * + * @param element + * The EObject to test + * @param className + * The name of the EClass + * @param metamodel + * The URI of the EPackage owning the EClass + * @return + * True if the EObject is an instance of the EClass, or of one of the EClass' subtypes + */ + public static boolean isInstance(EObject selectedItem, String className, String nsUri) { + EClass actualEClass = selectedItem.eClass(); + + // Exact match + if (isExactMatch(actualEClass, className, nsUri)) { + return true; + } + + List<EClass> allSuperTypes = actualEClass.getEAllSuperTypes(); + for (EClass eClass : allSuperTypes) { + if (isExactMatch(eClass, className, nsUri)) { + return true; + } + } + + return false; + } + + /** + * Tests whether the given EClass has the given className and belongs to the EPackage represented by nsUri + * + * @param eClass + * The EClass to test + * @param className + * + * @param nsUri + * @return + * True if the EClass' name is className and the EClass' EPackage's nsURI is nsUri + */ + private static boolean isExactMatch(EClass eClass, String className, String nsUri) { + return className.equals(eClass.getName()) && nsUri.equals(eClass.getEPackage().getNsURI()); + } + + /** + * Tests if the given eClass is a Subclass of fromClass + * Also returns true when eClass == fromClass + * + * @param eClass + * @param fromClass + * @return + * true if eClass is a subclass of fromClass + */ + public static boolean isSubclass(final EClass eClass, final EClass fromClass) { + // Everything is an EObject + if (eClass != null && fromClass == EcorePackage.eINSTANCE.getEObject()) { + return true; + } + + if (eClass == fromClass) { + return true; + } + + List<EClass> superTypes = eClass.getEAllSuperTypes(); + if (superTypes.contains(fromClass)) { + return true; + } + + return false; + } + + /** + * Returns the EObject corresponding to the input object + * Tests if the input is an EObject, or if it is Adaptable + * to an EObject + * + * @param source + * @return An EObject corresponding to the input source, or null + * if the EObject could not be resolved + */ + public static EObject getEObject(final Object source) { + + // Support for EMF 0.2 CustomizedTree: The TreeElements are IAdaptable, but the + // EObject adapter for some of them (e.g. reference node) is not what we need + Object resolved = Activator.getDefault().getEObjectResolver().resolve(source); + if ((resolved != source) && isEMFModelElement(resolved)) { + return (EObject) resolved; + } + + // General case + if (isEMFModelElement(source)) { + return (EObject) source; + } + + // Try to get an intrinsic adapter + if (source instanceof IAdaptable) { + EObject eObject = ((IAdaptable) source).getAdapter(EObject.class); + if (eObject == null) { // EMF Facet 0.1 + eObject = ((IAdaptable) source).getAdapter(EReference.class); + } + + if (eObject != null) { + return asEMFModelElement(eObject); // in case the adapter is a CDOResource + } + } + + // External adapter (last ditch case) + if (source != null) { + return asEMFModelElement(Platform.getAdapterManager().getAdapter(source, EObject.class)); + } + + return null; + } + + /** + * Queries whether an {@code object} is an EMF model element, an instance of + * some {@link EClass} from an EMF model. This isn't as simple as checking + * whether the object is an {@link EObject} because there are edge cases + * where objects are {@code EObject}s but shouldn't be treated as + * "model content". But, a minimum requirement is that the {@code object} is + * an {@link EObject}. + * + * @param object + * an object + * @return whether it is "model content" + * + * @see EMFHelper#asEMFModelElement(Object) + */ + public static boolean isEMFModelElement(Object object) { + return (object instanceof EObject) && !(object instanceof Resource); + } + + /** + * Casts an {@code object} as an EMF model element, if appropriate. + * + * @param object + * an object + * @return the object as an EMF model element, or {@code null} if it is not + * an EMF model element + * + * @see #isEMFModelElement(Object) + */ + public static EObject asEMFModelElement(Object object) { + return isEMFModelElement(object) ? (EObject) object : null; + } + + /** + * Retrieve the EditingDomain for the given source object. The object is first + * resolved to an EObject through #getEObject when possible. + * + * @param source + * @return + * The source object's editing domain, or null if it couldn't be found + */ + public static EditingDomain resolveEditingDomain(final Object source) { + return resolveEditingDomain(getEObject(source)); + } + + /** + * Retrieve the EditingDomain for the given source EObject + * + * @param source + * @return + * The source eObject's editing domain, or null if it couldn't be found + */ + public static EditingDomain resolveEditingDomain(final EObject source) { + EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source); + if (domain == null) { + try { + domain = ServiceUtils.getInstance().getTransactionalEditingDomain(null); + } catch (ServiceException e) { + // Ignore: We cannot find the domain + } + } + return domain; + } + + /** + * Return the eClassifier' qualified name. The qualified name is obtained by the concatenation + * of its package hierarchy with the class name, separated by the given separator + * + * @param eClassifier + * @param separator + * The separator used between each package name + * @return + * The EClassifier' qualified name + */ + public static String getQualifiedName(final EClassifier eClassifier, final String separator) { + return getQualifiedName(eClassifier.getEPackage(), separator) + separator + eClassifier.getName(); + } + + /** + * Return the ePackage's qualified name. The qualified name is obtained by the concatenation + * of its superPackage hierarchy with the ePackage name, separated by the given separator + * + * @param ePackage + * @param separator + * The separator used between each package name + * @return + * The EPackage's qualified name + */ + public static String getQualifiedName(final EPackage ePackage, final String separator) { + if (ePackage.getESuperPackage() == null) { + return ePackage.getName(); + } + return getQualifiedName(ePackage.getESuperPackage(), separator) + separator + ePackage.getName(); + } + + + /** + * Loads and returns the first EObject at the given URI. + * The EObject is loaded in the given resourceSet. + * + * @param resourceSet + * The ResourceSet in which the model will be loaded + * @param uri + * The URI describing the location of the model to load + * @return + * The first EObject located at the given URI + * @throws IOException + * When the URI cannot be loaded + */ + public static EObject loadEMFModel(ResourceSet resourceSet, final URI uri) throws IOException { + assert resourceSet != null : "null resourceSet"; //$NON-NLS-1$ + if (resourceSet == null) { + Activator.log.warn("Created a new resourceSet to load an EMF model in " + Activator.log.getCallerMethod()); //$NON-NLS-1$ + resourceSet = new ResourceSetImpl(); + } + + try { + Resource resource = resourceSet.getResource(uri, true); + if (resource != null) { + if (!resource.getContents().isEmpty()) { + return resource.getContents().get(0); + } + } + } catch (Exception ex) { + IOException exception = new IOException(ex.toString()); + exception.initCause(ex); + throw exception; + } + + return null; + } + + /** + * Completely unloads a resource set so that it and all the models it contained may be reclaimed by the + * Java garbage collector. This includes, at least: + * <ul> + * <li>unloading all resources in the set, which converts all model elements to proxies and removes all adapters from them</li> + * <li>removing all resources from the set</li> + * <li>removing all adapters from all resources</li> + * <li>removing all adapters from the resource set</li> + * </ul> + * + * @param resourceSet + * the resource set to purge + */ + public static void unload(ResourceSet resourceSet) { + List<Resource> resources = ImmutableList.copyOf(resourceSet.getResources()); + resourceSet.getResources().clear(); + for (Resource next : resources) { + next.unload(); + next.eAdapters().clear(); + } + resourceSet.eAdapters().clear(); + + // Clear the package registry (it may contain dynamic profile EPackages that we don't + // want to leak in BasicExtendedMetaData instances attached to static EPackages) + // Works around EMF bug 433108 + EPackage.Registry packageRegistry = resourceSet.getPackageRegistry(); + if (packageRegistry != null) { + packageRegistry.clear(); + } + } + + /** + * Return the root package containing the given package, or the package + * itself if it is already the root + * + * @param ePackage + * @return + * The Root package + */ + public static EPackage getRootPackage(final EPackage ePackage) { + if (ePackage == null) { + return null; + } + + if (ePackage.getESuperPackage() == null) { + return ePackage; + } + return getRootPackage(ePackage.getESuperPackage()); + } + + /** + * Gets the object of a given {@code type} containing an {@code object}, or the + * {@code object} itself if it is of that {@code type}. + * + * @param object + * the object for which to search for a container + * @param type + * the type of container to find + * + * @return the container of the requested {@code type}, or {@code null} if none + * @since 2.0 + */ + public static <T extends EObject> T getContainer(EObject object, EClass type) { + T result = null; + + for (EObject next = object; (next != null) && (result == null); next = next.eContainer()) { + if (type.isInstance(next)) { + @SuppressWarnings("unchecked") + T nextAsT = (T) next; + result = nextAsT; + } + } + + return result; + } + + /** + * Gets the object of a given {@code type} containing an {@code object}, or the + * {@code object} itself if it is of that {@code type}. + * + * @param object + * the object for which to search for a container + * @param type + * the type of container to find + * + * @return the container of the requested {@code type}, or {@code null} if none + * @since 2.0 + */ + public static <T extends EObject> T getContainer(EObject object, Class<T> type) { + T result = null; + + for (EObject next = object; (next != null) && (result == null); next = next.eContainer()) { + if (type.isInstance(next)) { + result = type.cast(next); + } + } + + return result; + } + + /** + * Return the list of EClasses that are subtypes + * of the given EClass + * + * @param type + * @param concreteClassesOnly + * If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered + * @return + * The list of EClasses implementing or extending the given EClass + */ + public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly) { + Set<EClass> result = new LinkedHashSet<EClass>(); + if (!concreteClassesOnly || (!type.isAbstract() && !type.isInterface())) { + result.add(type); + } + + EPackage ePackage = getRootPackage(type.getEPackage()); + getSubclassesOf(type, ePackage, result, concreteClassesOnly); + return new LinkedList<EClass>(result); + } + + /** + * Return the list of EClasses that are sub types + * of the given EClass + * + * @param type + * @param concreteClassesOnly + * If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered + * @param packagesToBrowse + * The EPackages in which the EClasses should be retrieved + * @return + * The list of EClasses implementing or extending the given EClass + */ + public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly, Collection<EPackage> packagesToBrowse) { + Set<EClass> result = new LinkedHashSet<EClass>(); + if (!concreteClassesOnly || (!type.isAbstract() && !type.isInterface())) { + result.add(type); + } + + for (EPackage ePackage : packagesToBrowse) { + getSubclassesOf(type, ePackage, result, concreteClassesOnly); + } + + return new LinkedList<EClass>(result); + } + + /** + * Return the list of EClasses that are sub types of the given EClass + * + * @param type + * @param concreteClassesOnly + * If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered + * @param browseAllRegisteredPackages + * If true, all registered EPackages will be navigated to retrieve the matching EClasses. Otherwise, + * only the current EPackage will be used. + * @return + * The list of EClasses implementing or extending the given EClass + */ + public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly, final boolean browseAllRegisteredPackages) { + // If the current package is a dynamic package, it may not be registered (?). Add it directly + EPackage currentPackage = getRootPackage(type.getEPackage()); + + Set<EPackage> allPackages = new LinkedHashSet<EPackage>(); + allPackages.add(currentPackage); + + if (browseAllRegisteredPackages) { + // FIXME // WARNING: This loop will load all EPackages. The first call is expensive. + Set<String> allUris = new HashSet<String>(EPackage.Registry.INSTANCE.keySet()); + + for (String nsURI : allUris) { + allPackages.add(EPackage.Registry.INSTANCE.getEPackage(nsURI)); + } + } + + return getSubclassesOf(type, concreteClassesOnly, allPackages); + } + + private static void getSubclassesOf(final EClass type, final EPackage fromPackage, final Set<EClass> result, final boolean concreteClassesOnly) { + for (EClassifier classifier : fromPackage.getEClassifiers()) { + if (classifier instanceof EClass) { + EClass eClass = (EClass) classifier; + if (eClass.getEAllSuperTypes().contains(type)) { + if (!concreteClassesOnly || (!eClass.isAbstract() && !eClass.isInterface())) { + result.add(eClass); + } + } + } + } + + for (EPackage subPackage : fromPackage.getESubpackages()) { + getSubclassesOf(type, subPackage, result, concreteClassesOnly); + } + } + + /** + * Tests if an EObject is read only on any {@linkplain ReadOnlyAxis axis}. + * Delegates to the EObject's editing domain if it can be found + * + * @param eObject + * @return + * True if the EObject is read only on any axis + * @see #isReadOnly(Set, EObject, EditingDomain) + */ + public static boolean isReadOnly(final EObject eObject) { + return isReadOnly(ReadOnlyAxis.anyAxis(), eObject); + } + + /** + * Tests if an EObject is read only on any of the specified {@code axes}. + * Delegates to the EObject's editing domain if it can be found + * + * @param axes + * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful + * @param eObject + * @return + * True if the EObject is read only on any of the given {@code axes} + */ + public static boolean isReadOnly(Set<ReadOnlyAxis> axes, final EObject eObject) { + EditingDomain domain = resolveEditingDomain(eObject); + return isReadOnly(axes, eObject, domain); + } + + /** + * Tests if an EObject is read only on any {@linkplain ReadOnlyAxis axis}. + * Delegates to the given editing domain if it isn't null + * + * @param eObject + * @param domain + * @return + * True if the EObject is read only on any axis + */ + public static boolean isReadOnly(final EObject eObject, final EditingDomain domain) { + return isReadOnly(ReadOnlyAxis.anyAxis(), eObject, domain); + } + + /** + * Tests if an EObject is read only on any of the specified {@code axes}. + * Delegates to the given editing domain if it isn't null + * + * @param axes + * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful + * @param eObject + * + * @param domain + * @return + * True if the EObject is read only + */ + public static boolean isReadOnly(Set<ReadOnlyAxis> axes, final EObject eObject, final EditingDomain domain) { + if (domain != null) { + Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class); + if (handler instanceof IReadOnlyHandler2) { + return ((IReadOnlyHandler2) handler).isReadOnly(axes, eObject).get(); + } else if (handler instanceof IReadOnlyHandler) { + // these handlers only deal with permission-based read-only-ness + return axes.contains(ReadOnlyAxis.PERMISSION) && ((IReadOnlyHandler) handler).isReadOnly(eObject).get(); + } + + if (eObject.eResource() != null) { + return domain.isReadOnly(eObject.eResource()); + } + } + return false; + } + + /** + * Tests if the Resource is read only on any {@linkplain ReadOnlyAxis axis}. + * Delegates to the given editing domain if it isn't null + * + * @param resource + * @param domain + * @return + * True if the Resource is read only on any axis + */ + public static boolean isReadOnly(final Resource resource, final EditingDomain domain) { + return isReadOnly(ReadOnlyAxis.anyAxis(), resource, domain); + } + + /** + * Tests if the Resource is read only on any of the given {@code axes}. + * Delegates to the given editing domain if it isn't null + * + * @param axes + * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful + * @param resource + * @param domain + * @return + * True if the Resource is read only on any of the given {@code axes} + */ + public static boolean isReadOnly(Set<ReadOnlyAxis> axes, final Resource resource, final EditingDomain domain) { + if (resource == null) { + return false; + } + + if (domain != null && resource.getURI() != null) { + Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class); + if (handler instanceof IReadOnlyHandler2) { + return ((IReadOnlyHandler2) handler).anyReadOnly(axes, new URI[] { resource.getURI() }).get(); + } else if (handler instanceof IReadOnlyHandler) { + // these handlers only deal with permission-based read-only-ness + return axes.contains(ReadOnlyAxis.PERMISSION) && ((IReadOnlyHandler) handler).anyReadOnly(new URI[] { resource.getURI() }).get(); + } + return domain.isReadOnly(resource); + } + + // no editing domain : use file system attribute + ResourceSet resourceSet = resource.getResourceSet(); + + if (resourceSet == null) { + return false; + } + + Map<String, ?> attributes = resourceSet.getURIConverter().getAttributes(resource.getURI(), null); + Boolean readOnly = (Boolean) attributes.get(URIConverter.ATTRIBUTE_READ_ONLY); + + return readOnly == null ? false : readOnly; + } + + /** + * Tests if an object that is read only could possibly be made writable by some means (file system attributes, team provider hook, database + * permissions, etc.) + * + * @param eObject + * an object that is assumed to be read-only + * @param domain + * the editing domain context of the {@link eObject} + * @return + * whether the {@code eObject} could be made writable + */ + public static boolean canMakeWritable(final EObject eObject, final EditingDomain domain) { + return canMakeWritable(ReadOnlyAxis.anyAxis(), eObject, domain); + } + + /** + * Tests if an object that is read only could possibly be made writable according to any of + * the specified {@code axes} of read-only-ness. + * + * @param axes + * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful + * @param eObject + * an object that is assumed to be read-only + * @param domain + * the editing domain context of the {@link eObject} + * @return + * whether the {@code eObject} could be made writable + */ + public static boolean canMakeWritable(Set<ReadOnlyAxis> axes, final EObject eObject, final EditingDomain domain) { + if (domain != null) { + Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class); + if (handler instanceof IReadOnlyHandler2) { + return ((IReadOnlyHandler2) handler).canMakeWritable(axes, eObject).or(false); + } + } + return false; + } + + /** + * Tests if a resource that is read only could possibly be made writable by some means (file system attributes, team provider hook, database + * permissions, etc.) + * + * @param resource + * a resource that is assumed to be read-only + * @param domain + * the editing domain context of the {@link resource} + * @return + * whether the {@code resource} could be made writable + */ + public static boolean canMakeWritable(final Resource resource, final EditingDomain domain) { + return canMakeWritable(ReadOnlyAxis.anyAxis(), resource, domain); + } + + /** + * Tests if a resource that is read only could possibly be made writable according to any of + * the specified {@code axes} of read-only-ness. + * + * @param axes + * a set if orthogonal axes of read-only-ness to consider. May be empty, but that would not be especially useful + * @param resource + * a resource that is assumed to be read-only + * @param domain + * the editing domain context of the {@link resource} + * @return + * whether the {@code resource} could be made writable + */ + public static boolean canMakeWritable(Set<ReadOnlyAxis> axes, final Resource resource, final EditingDomain domain) { + if (domain != null) { + Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class); + if (handler instanceof IReadOnlyHandler2) { + return ((IReadOnlyHandler2) handler).canMakeWritable(axes, new URI[] { resource.getURI() }).or(false); + } + } + return false; + } + + /** + * Tests if the given EStructuralFeature is required (ie. should always + * have a value) + * + * A feature is required if at least of one the following conditions if + * true : + * + * - It has a defaultValue + * - Its lowerBound is at least 1 + * - It is an enumeration (Enumerations always have a default value) + * - It is a Java primitive type, and is not marked as Unsettable + * + * @param feature + * the feature to test + * @return + * true if the feature is required, false otherwise + */ + public static boolean isRequired(final EStructuralFeature feature) { + EClassifier eType = feature.getEType(); + if (eType == null) { + return false; + } + + // EEnums are always required, as an EEnum always has a default value + if (eType instanceof EEnum) { + return true; + } + + // At least one value means it is required + if (feature.getLowerBound() >= 1) { + return true; + } + + // Java primitive types cannot have a null value + // if the feature is not specifically marked as unsettable, then it is required + if (eType.getInstanceClass() != null && eType.getInstanceClass().isPrimitive() && !feature.isUnsettable()) { + return true; + } + + // If there is a default value, there is always a value + if (feature.getDefaultValueLiteral() != null) { + return true; + } + + return false; // The property if not required + } + + /** + * Returns all objects of type T contained in the resource + * + * @param resource + * @param type + * @return + */ + public static <T> Set<T> allInstances(final Resource resource, Class<T> type) { + TreeIterator<EObject> iterator = resource.getAllContents(); + Set<T> result = new LinkedHashSet<T>(); + + while (iterator.hasNext()) { + EObject element = iterator.next(); + if (type.isInstance(element)) { + result.add(type.cast(element)); + } + } + + return result; + } + + /** + * Returns all the EPackages and nested EPackages contained in this resource + * + * @param resource + * @return + */ + public static Set<EPackage> getAllEPackages(final Resource resource) { + Set<EPackage> result = new LinkedHashSet<EPackage>(); + + for (EObject rootElement : resource.getContents()) { + if (rootElement instanceof EPackage) { + result.add((EPackage) rootElement); + result.addAll(getAllNestedPackages((EPackage) rootElement)); + } + } + + return result; + } + + /** + * Returns all packages nested in the given EPackage (recursively). Does not + * include the base EPackage. + * + * @param basePackage + * @return + */ + public static Set<EPackage> getAllNestedPackages(EPackage basePackage) { + Set<EPackage> result = new LinkedHashSet<EPackage>(); + + for (EPackage nestedPackage : basePackage.getESubpackages()) { + result.add(nestedPackage); + result.addAll(getAllNestedPackages(nestedPackage)); + } + + return result; + } + + /** + * + * @param resource + * a resource + * + * @return + * the list of the metamodels known by the resource + */ + public static Set<EPackage> getMetamodels(final Resource resource) { + Set<EPackage> metamodels = new HashSet<EPackage>(); + if (resource != null) { + final List<EObject> contents = new ArrayList<EObject>(resource.getContents()); + for (final EObject current : contents) { + metamodels.add(current.eClass().getEPackage()); + } + } + return metamodels; + } + + /** + * + * Returns the XMI ID of the given {@link EObject} or <code>null</code> if it cannot be resolved. + * + * @param object + * Object which we seek the XMI ID of. + * @return <code>object</code>'s XMI ID, <code>null</code> if not applicable. + */ + public static final String getXMIID(final EObject object) { + String objectID = null; + if (object != null && object.eResource() instanceof XMIResource) { + objectID = ((XMIResource) object.eResource()).getID(object); + } + return objectID; + } + + + + /** + * Gets the usages. + * + * @param source + * the source + * + * @return the usages or null if there is no usages + */ + public static Collection<Setting> getUsages(EObject source) { + // the functional code is defined in core because we need it in infra.core + // but infra.core can't depend on infra.emf (circular dependency) + return org.eclipse.papyrus.infra.core.utils.EMFHelper.getUsages(source); + } + + + /** + * <pre> + * Test if the used element is referenced by other elements than the known + * referencer (except its container). It ignores references from an other meta-model. + * </pre> + * + * @param usedObject + * the used object + * @param knownReferencer + * the known referencer + * @return true if the known referencer is the only referencer. + */ + public static boolean isOnlyUsage(EObject usedObject, EObject knownReferencer) { + boolean isUsed = false; + EPackage mmPackage = usedObject.eClass().getEPackage(); + + // Retrieve the list of elements referencing the usedObject. + Set<EObject> crossReferences = new HashSet<EObject>(); + for (Setting setting : getUsages(usedObject)) { + EObject eObj = setting.getEObject(); + if (eObj.eClass().getEPackage().equals(mmPackage)) { + crossReferences.add(eObj); + } + } + + // Remove the container of used object. + crossReferences.remove(usedObject.eContainer()); + // Remove the knownReferencer from the list of references. + crossReferences.remove(knownReferencer); + + // If no referencer remains in the list, the known element is the only + // usage. + if (crossReferences.isEmpty()) { + isUsed = true; + } + + return isUsed; + } + + /** + * + * @param superType + * an eclassifier + * @param subType + * another eClassifier + * @return + * <code>true</code> if the 2nd {@link EClassifier} is a subtype of the first one + */ + public static boolean isSuperType(final EClassifier superType, final EClassifier subType) { + if (superType == subType) { + return true; + } + + if (superType instanceof EClass && subType instanceof EClass) { + // special case because isSuperTypeOf doesn't handle it + if (superType == EcorePackage.eINSTANCE.getEObject()) { + return true; + } + + EClass superTypeEClass = (EClass) superType; + EClass subTypeEClass = (EClass) subType; + return superTypeEClass.isSuperTypeOf(subTypeEClass); + } + + // manage EDtataType + if (superType == EcorePackage.eINSTANCE.getEDataType() && subType instanceof EDataType) { + return true; + } + + return false; + } + + /** + * Computes the path from the root EObject to the given element, as a List of EObjects + * + * @param element + * @return + */ + public static List<EObject> getContainmentPath(EObject element) { + List<EObject> result; + if (element.eContainer() == null) { + result = new LinkedList<EObject>(); + result.add(element); + return result; + } else { + result = getContainmentPath(element.eContainer()); + result.add(element); + } + return result; + } + + /** + * Returns the given element, reloaded into the resource set of the context element, + * or the source element itself if not possible. + * + * Use this method for e.g. loading an element from a shared resource set into another resource set + * (Apply a registered profile/library, drop an element from the project explorer, ...) + * + * @param element + * @param contextElement + * @return + */ + public static <T extends EObject> T reloadIntoContext(T element, EObject contextElement) { + ResourceSet sourceResourceSet = getResourceSet(element); + ResourceSet loadingContext = getResourceSet(contextElement); + + if (sourceResourceSet == loadingContext || loadingContext == null) { + return element; + } + + URI sourceURI = EcoreUtil.getURI(element); + EObject result = loadingContext.getEObject(sourceURI, true); + + return (T) result; + } + + /** + * Returns the resourceSet owning this eObject, or null if it is detached + * + * @param eObject + */ + public static ResourceSet getResourceSet(EObject eObject) { + Resource resource = (eObject == null) ? null : eObject.eResource(); + return (resource == null) ? null : resource.getResourceSet(); + } + + /** + * Best-effort loads a resource, returning the first root element of the requested {@code type}. Unlike the {@link #loadChecked(ResourceSet, URI, Class) loadChecked} method, this will never throw an exception. + * + * @param rset + * a resource set in which to load the resource + * @param uri + * the URI of the resource to load + * @param type + * the type of root element to retrieve + * + * @return the requested root element, or {@code null} if the resource does not contain such an element or could not be loaded + * + * @see #loadChecked(ResourceSet, URI, Class) + */ + public static <T extends EObject> T load(ResourceSet rset, URI uri, Class<T> type) { + T result = null; + + try { + result = loadChecked(rset, uri, type); + } catch (Exception e) { + Activator.log.error("Exception in loading resource " + uri, e); //$NON-NLS-1$ + + // Maybe it was partially loaded? If so, try again + Resource res = rset.getResource(uri, false); + if ((res != null) && res.isLoaded()) { + result = Iterables.getFirst(Iterables.filter(res.getContents(), type), null); + } + } + + return result; + } + + /** + * Best-effort loads a resource, returning the first root element of the requested {@code type}. + * + * @param rset + * a resource set in which to load the resource + * @param uri + * the URI of the resource to load + * @param type + * the type of root element to retrieve + * + * @return the requested root element, or {@code null} if the resource does not contain such an element or could not be loaded + * @throws IOException + * on an I/O problem in loading the resource + * @throw RuntimeException on any other unforeseen (usually programming error) problem + * + * @see #load(ResourceSet, URI, Class) + */ + public static <T extends EObject> T loadChecked(ResourceSet rset, URI uri, Class<T> type) throws IOException { + try { + return Iterables.getFirst(Iterables.filter(rset.getResource(uri, true).getContents(), type), null); + } catch (WrappedException e) { + if (e.exception() instanceof IOException) { + throw (IOException) e.exception(); + } else if (e.exception() instanceof RuntimeException) { + throw (RuntimeException) e.exception(); + } else { + throw e; + } + } + } +} diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.project index 16fd397042a..8368019aeaa 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.project +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF index cddde77a32d..4ed317ef7fd 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF @@ -7,26 +7,16 @@ Export-Package: org.eclipse.papyrus.infra.ui.emf.adapters, org.eclipse.papyrus.infra.ui.emf.utils, org.eclipse.papyrus.infra.ui.internal.emf;x-internal:=true, org.eclipse.papyrus.infra.ui.internal.emf.expressions;x-internal:=true, - org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers -Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.emf.edit.ui;bundle-version="2.8.0", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0", - org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" + org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers;x-internal:=true +Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)";visibility:=reexport, + org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath index e4dad7e73e2..664b52ed755 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.project b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.project index ccfe5b57b73..46c71d72ecd 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.project +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF index 11762be1a9c..a988e3a3387 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.filters.provider -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.edit;bundle-version="2.11.0";visibility:=reexport, - org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport, - org.eclipse.uml2.common.edit;bundle-version="2.0.0";visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.common.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.project b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.project index bbf564865dc..8b80a6227c0 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.project +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.project @@ -20,10 +20,34 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/.api_filters b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/.api_filters new file mode 100644 index 00000000000..93e4f961d9b --- /dev/null +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.filters" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="927989779"> + <message_arguments> + <message_argument value="1.2.0"/> + <message_argument value="org.eclipse.uml2.common"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF index 975b7f92cfc..a298a1ab49f 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF @@ -1,9 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport, - org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport, - org.eclipse.uml2.common;visibility:=reexport, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0" +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.filters, org.eclipse.papyrus.infra.filters.impl, org.eclipse.papyrus.infra.filters.internal;x-internal:=true, diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.project b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.project index 62867c1fd82..e4a39af0e95 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.project +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF index b73cbc3a7aa..3fb6c54c087 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF @@ -1,22 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="2.9.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.uml2.common.edit;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.provider.AssistantEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.provider +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.provider.AssistantEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.project b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.project index 2019bfd4ece..cf062ceb8dc 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.project +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF index 0b3afa38886..9b84e5825bf 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF @@ -1,20 +1,17 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.assistant.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="3.10.100";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="2.9.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters.edit;bundle-version="1.2.0";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation.AssistantEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.assistant.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation.AssistantEditorPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.project b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.project index d213e8c37a5..cd99ffa33c9 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.project +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF index fc1e09a16dc..ac73c9d4d6d 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF @@ -1,21 +1,17 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.9.100",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui;x-internal:=true,
- org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.handlers;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui;x-internal:=true, + org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.handlers;x-internal:=true +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.project b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.project index 465a683be7b..1ffc12045fe 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.project +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.project @@ -20,9 +20,31 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF index 13911bc17f6..d9ced935578 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF @@ -1,39 +1,26 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.uml2.common;bundle-version="2.0.100";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.gmf.runtime.emf.ui;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- com.ibm.icu;bundle-version="52.1.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant,
- org.eclipse.papyrus.infra.gmfdiag.assistant.core,
- org.eclipse.papyrus.infra.gmfdiag.assistant.core.util,
- org.eclipse.papyrus.infra.gmfdiag.assistant.impl,
- org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core; x-friends:="org.eclipse.papyrus.infra.gmfdiag.assistant.ui",
- org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.util;x-internal:=true,
- org.eclipse.papyrus.infra.gmfdiag.assistant.internal.expressions;x-internal:=true,
- org.eclipse.papyrus.infra.gmfdiag.assistant.internal.operations;x-internal:=true,
- org.eclipse.papyrus.infra.gmfdiag.assistant.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.AssistantPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + com.ibm.icu;bundle-version="52.1.0" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant, + org.eclipse.papyrus.infra.gmfdiag.assistant.core, + org.eclipse.papyrus.infra.gmfdiag.assistant.core.util, + org.eclipse.papyrus.infra.gmfdiag.assistant.impl, + org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core; x-friends:="org.eclipse.papyrus.infra.gmfdiag.assistant.ui", + org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.util;x-internal:=true, + org.eclipse.papyrus.infra.gmfdiag.assistant.internal.expressions;x-internal:=true, + org.eclipse.papyrus.infra.gmfdiag.assistant.internal.operations;x-internal:=true, + org.eclipse.papyrus.infra.gmfdiag.assistant.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.AssistantPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.project index 1b939fb2cc4..41b2bf19b6e 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.project +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css.configuration</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css.configuration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF index acc8686722e..9d988f1ebc7 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF @@ -1,32 +1,14 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.5.0",
- org.eclipse.draw2d;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.e4.ui.css.core;bundle-version="0.10.2",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.xtext.common.types,
- org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: CSS Configuration
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.configuration;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: CSS Configuration +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.configuration;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.project index ca8a42ae981..2f68e401248 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.project +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css.properties</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css.properties</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF index 83ce4dc8841..cf3ea4b22a1 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF @@ -2,33 +2,11 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation, org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding, org.eclipse.papyrus.infra.gmfdiag.css.properties.provider -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.emf.edit;bundle-version="2.8.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.e4.ui.css.core;bundle-version="0.10.0", - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/.project index 37460a6fb23..355368fba00 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/.project +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css.theme</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</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.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css.theme</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF index 6fbc836937b..b65744dbbe4 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Papyrus Theme
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.theme;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Papyrus Theme +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.theme;singleton:=true diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.project index b4c4ad7ab90..ac3988394ac 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.project +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css</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>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF index 86a8fbcc0db..0766f770837 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF @@ -16,32 +16,13 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.css, org.eclipse.papyrus.infra.gmfdiag.css.spi, org.eclipse.papyrus.infra.gmfdiag.css.style.impl, org.eclipse.papyrus.infra.gmfdiag.css.theme -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.e4.ui.css.core;bundle-version="0.10.0", - org.eclipse.emf.ecore;bundle-version="2.8.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.w3c.css.sac;bundle-version="1.3.1", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0", - org.w3c.dom.svg;bundle-version="1.1.0", - org.eclipse.emf.edit.ui, - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", + org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.project index 8acb9f2acd3..21ccd421155 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.project +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF index d105d17b046..7d859f3cdbe 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF @@ -1,18 +1,12 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.xtext.ui, - org.eclipse.ui.editors;bundle-version="3.5.0", - org.eclipse.ui.ide;bundle-version="3.5.0", - org.eclipse.xtext.ui.shared, - org.eclipse.ui, - org.eclipse.xtext.builder, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtext.common.types.ui, - org.eclipse.xtext.ui.codetemplates.ui, - org.eclipse.compare, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.common.types.ui;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.10.0,3.0.0)", + org.eclipse.compare;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix, org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist, org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal, @@ -24,5 +18,5 @@ Bundle-Name: CSS3 Xtext Editor (UI) Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui; singleton:=true -Import-Package: org.apache.log4j +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch index f64617deb4f..aa2cfe4f8ea 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch @@ -14,6 +14,7 @@ <booleanAttribute key="default" value="true"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseXtext"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> @@ -23,6 +24,7 @@ <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> <booleanAttribute key="useProduct" value="true"/> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.project index b4140ae3656..53bbb65ec38 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.project +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF index 8458660a0e4..6d94b770a67 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF @@ -1,37 +1,32 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext;bundle-version="2.8.1";visibility:=reexport,
- org.eclipse.equinox.common;bundle-version="3.5.0",
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.eclipse.xtext.xbase.lib,
- org.antlr.runtime,
- org.eclipse.xtext.common.types,
- org.objectweb.asm;bundle-version="[5.0.1,
- 6.0.0)";resolution:=optional
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3,
- org.eclipse.papyrus.infra.gmfdiag.css3.services,
- org.eclipse.papyrus.infra.gmfdiag.css3.cSS,
- org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl,
- org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util,
- org.eclipse.papyrus.infra.gmfdiag.css3.serializer,
- org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr,
- org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal,
- org.eclipse.papyrus.infra.gmfdiag.css3.validation,
- org.eclipse.papyrus.infra.gmfdiag.css3.scoping,
- org.eclipse.papyrus.infra.gmfdiag.css3.generator,
- org.eclipse.papyrus.infra.gmfdiag.css3.formatting
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: CSS3 Xtext Editor
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext; singleton:=true
-Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)", + org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport, + org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.common.types;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.objectweb.asm;bundle-version="[5.0.0,6.0.0)";resolution:=optional +Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3, + org.eclipse.papyrus.infra.gmfdiag.css3.services, + org.eclipse.papyrus.infra.gmfdiag.css3.cSS, + org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl, + org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util, + org.eclipse.papyrus.infra.gmfdiag.css3.serializer, + org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr, + org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal, + org.eclipse.papyrus.infra.gmfdiag.css3.validation, + org.eclipse.papyrus.infra.gmfdiag.css3.scoping, + org.eclipse.papyrus.infra.gmfdiag.css3.generator, + org.eclipse.papyrus.infra.gmfdiag.css3.formatting +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: CSS3 Xtext Editor +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext; singleton:=true +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.project index f6b5f1abf9b..a36b01b1c74 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.extensionpoints.editors</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.extensionpoints.editors</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF index 164d9b554fd..e7eceb42fa6 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF @@ -1,25 +1,21 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.10.0",
- org.eclipse.ui;bundle-version="3.1.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.extensionpoints.editors,
- org.eclipse.papyrus.extensionpoints.editors.configuration,
- org.eclipse.papyrus.extensionpoints.editors.definition,
- org.eclipse.papyrus.extensionpoints.editors.preferences,
- org.eclipse.papyrus.extensionpoints.editors.ui,
- org.eclipse.papyrus.extensionpoints.editors.ui.images,
- org.eclipse.papyrus.extensionpoints.editors.utils
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.extensionpoints.editors.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.extensionpoints.editors;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.extensionpoints.editors, + org.eclipse.papyrus.extensionpoints.editors.configuration, + org.eclipse.papyrus.extensionpoints.editors.definition, + org.eclipse.papyrus.extensionpoints.editors.preferences, + org.eclipse.papyrus.extensionpoints.editors.ui, + org.eclipse.papyrus.extensionpoints.editors.ui.images, + org.eclipse.papyrus.extensionpoints.editors.utils +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.extensionpoints.editors.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.extensionpoints.editors;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.project index c42cca145e2..8211601fa87 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.canonical</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.canonical</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF index e99f122fb7f..681487bb7cf 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF @@ -1,29 +1,17 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.gef,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy,
- org.eclipse.papyrus.infra.gmfdiag.canonical.internal,
- org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider,
- org.eclipse.papyrus.infra.gmfdiag.canonical.strategy
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy, + org.eclipse.papyrus.infra.gmfdiag.canonical.internal, + org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider, + org.eclipse.papyrus.infra.gmfdiag.canonical.strategy +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project index 7eaedb9bed9..5da1f1bc90a 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.commands</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.commands</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF index d7098a42fba..02db645d4ef 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF @@ -1,22 +1,11 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui.workbench, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.common.core, - org.eclipse.emf.common, - org.eclipse.gef, - org.eclipse.emf.workspace;bundle-version="1.4.0", - org.eclipse.emf.transaction.ui;bundle-version="1.4.0", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.500", - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0";visibility:=reexport +Require-Bundle: org.eclipse.emf.transaction.ui;bundle-version="[1.4.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.commands, org.eclipse.papyrus.commands.util, org.eclipse.papyrus.commands.wrappers diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.project index 175f9cf2a2b..85ef0fdff47 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.project @@ -1,28 +1,50 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.common</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.common</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF index 893df0dbd6e..b3ba254ddde 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF @@ -45,57 +45,26 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common, org.eclipse.papyrus.infra.gmfdiag.common.updater, org.eclipse.papyrus.infra.gmfdiag.common.utils, org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;x-internal:=true -Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0", - org.eclipse.emf.ecore.edit;bundle-version="2.5.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.gef;bundle-version="3.7.1";visibility:=reexport, - org.eclipse.emf.workspace;bundle-version="1.4.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0";visibility:=reexport, - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.emf.databinding;bundle-version="1.3.0", - org.eclipse.core.databinding.property;bundle-version="1.4.200", - org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1", - org.eclipse.core.expressions, +Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)", org.apache.batik.util;bundle-version="[1.6.0,1.7.0)", org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)", - org.w3c.dom.svg;bundle-version="1.1.0", + org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)";visibility:=reexport, org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)", org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)", org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", + org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)";visibility:=reexport, com.ibm.icu, - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0", - org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0", - org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0", - org.eclipse.gmf.runtime.draw2d.ui.render.awt, - org.apache.xerces;bundle-version="2.9.0", - org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.papyrus.infra.sync;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0" + org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.sync;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.project index 19213cd5bab..727bb02df34 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.controlmode</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.controlmode</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF index 9c8597902ca..20dcd1223aa 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF @@ -1,20 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: GMF-specific control mode behavior
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.controlmode.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.controlmode;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: GMF-specific control mode behavior +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.controlmode.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.controlmode;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.project index 848c11e792d..e48ca8dd112 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.css.model</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>
- <nature>org.eclipse.emf.facet.common.ProjectNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.css.model</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF index 8ebc8bd94ff..e346776dce0 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF @@ -1,8 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.ui, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0" +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.model, org.eclipse.papyrus.infra.gmfdiag.css.stylesheets, org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.impl, diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.project index 324cb4fce86..c15797e548a 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.dnd</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.dnd</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF index fb3f35a85a6..549a96d51ec 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF @@ -1,23 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.dnd.policy,
- org.eclipse.papyrus.infra.gmfdiag.dnd.strategy
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Customizable Drag and Drop
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.dnd;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.gmfdiag.dnd.policy, + org.eclipse.papyrus.infra.gmfdiag.dnd.strategy +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Customizable Drag and Drop +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.dnd;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.project index 6862aaa77bf..0c578724d26 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF index 72372bd72cb..0fe3bc91d0f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF @@ -1,22 +1,9 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.gmfdiag.export -Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0", - org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.4.1", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.core.expressions;bundle-version="3.4.300", - org.eclipse.emf.common.ui;bundle-version="2.7.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.semantic;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.semantic;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.project index 41ce0a64ca8..90739afd830 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF index 2275e528a4f..7d1b7a75d07 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF @@ -1,15 +1,8 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.gmfdiag.gef.internal;x-internal:=true, org.eclipse.papyrus.infra.gmfdiag.gef.internal.editor;x-internal:=true -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui;bundle-version="3.100.0", - org.eclipse.ui.ide;bundle-version="3.12.0", - org.eclipse.gef;bundle-version="3.10.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.emf.edit;bundle-version="2.12.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.7.0" +Require-Bundle: org.eclipse.gef;bundle-version="[3.11.0,4.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.project index 96c8d431fe2..53b29ee1f00 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF index 155e2278b2b..c6aecbb0f1f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF @@ -1,14 +1,11 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.gmf.runtime.common.ui.services.action,
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.project index 094c2587586..31a1f74e06c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.hyperlink</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.hyperlink</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF index 495a4876555..e48f4b8af40 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF @@ -1,26 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.hyperlink, org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies, org.eclipse.papyrus.infra.gmfdiag.hyperlink.helper, diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.project index 98b6b3b7acc..a89b6b33393 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.menu</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.menu</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF index adee178f3f9..ac74efcbd2e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF @@ -1,28 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.menu,
- org.eclipse.papyrus.infra.gmfdiag.menu.handlers,
- org.eclipse.papyrus.infra.gmfdiag.menu.utils
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.menu, + org.eclipse.papyrus.infra.gmfdiag.menu.handlers, + org.eclipse.papyrus.infra.gmfdiag.menu.utils +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.project index 59c30c16c77..b4dd7a634c6 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</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.papyrus.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF index 7b9c864a936..d83e8956b39 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF @@ -1,30 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - com.google.guava;bundle-version="11.0.0", - org.eclipse.gmf.runtime.notation, - org.eclipse.emf.transaction, - org.eclipse.gmf.runtime.common.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.core.expressions, - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", - org.eclipse.emf.ecore, - org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier @@ -33,6 +11,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.modelexplorer.Activator Bundle-Description: %pluginDescription -Import-Package: org.eclipse.papyrus.emf.facet.custom.ui Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.modelexplorer;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project index ae030e4c71b..7fc7f633c03 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.navigation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.navigation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF index 166f3116933..0c7a24e29bc 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF @@ -1,23 +1,12 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.300", - org.eclipse.ui.navigator;bundle-version="3.5.100", - org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.services.navigation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.openelement;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.gmfdiag.navigation, org.eclipse.papyrus.infra.gmfdiag.navigation.decorator, org.eclipse.papyrus.infra.gmfdiag.navigation.editpolicy, diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project index f47f80c973c..b7dfd3fd404 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.outline</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.outline</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF index cd4699ce510..443c17a9f20 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF @@ -2,20 +2,9 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.gmfdiag.outline, org.eclipse.papyrus.infra.gmfdiag.outline.internal;x-internal:=true, org.eclipse.papyrus.infra.gmfdiag.outline.overview -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.emf.edit.ui;bundle-version="2.12.0", - org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0", - org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.gef;bundle-version="3.7.1", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project index e5424473c0d..14d6364f777 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project @@ -1,28 +1,50 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.preferences</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.preferences</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF index 83fac59ae07..eb9d6e03090 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF @@ -9,12 +9,10 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.preferences, org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram, org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor, org.eclipse.papyrus.infra.gmfdiag.preferences.utils -Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", com.ibm.icu, - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0";visibility:=reexport + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project index 406b60555a6..4cef2cc2854 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.properties</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.properties</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF index 2b4abcf5b19..13245b52c16 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF @@ -1,32 +1,10 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension, org.eclipse.papyrus.infra.gmfdiag.properties.modelelement -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.4.1", - org.eclipse.emf.edit;bundle-version="2.7.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.0", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.core.databinding.property;bundle-version="1.4.0", - org.eclipse.core.databinding.beans;bundle-version="1.2.100", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.emf.edit.ui;bundle-version="2.7.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint" Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.project index 297212664ff..d3ae7419ec2 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.viewersearcher</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.viewersearcher</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF index df292fd8500..2a97be3f2f3 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF @@ -1,15 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.emf.ecore;bundle-version="2.9.0", - org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0", - org.eclipse.papyrus.views.search;bundle-version="1.2.0", - org.eclipse.search;bundle-version="3.8.100", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.search;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %vendorName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.project index c8f1479375e..3541227e919 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF index 89aa9905c1d..cab8d5fccbd 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF @@ -2,34 +2,12 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.gmfdiag.welcome.internal;x-internal:=true, org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements;x-internal:=true, org.eclipse.papyrus.infra.gmfdiag.welcome.internal.widgets;x-internal:=true -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.ui;bundle-version="3.100.0", - org.eclipse.ui.forms;bundle-version="3.7.0", - org.eclipse.papyrus.infra.editor.welcome;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.8.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.6.0", - org.eclipse.emf.databinding;bundle-version="1.3.0", - org.eclipse.jface.databinding;bundle-version="1.8.0", - org.eclipse.core.databinding.property;bundle-version="1.6.0", - org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="1.4.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.editor.welcome;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project index 37940b6f3ec..33184dc1b5a 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.widgets</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.gmfdiag.widgets</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF index 9165840a956..761e9af6a6e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF @@ -1,13 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2", - org.eclipse.core.databinding;bundle-version="1.4.0", - org.eclipse.jface.databinding;bundle-version="1.5.0", - org.eclipse.core.databinding.property;bundle-version="1.4.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, + org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.gmfdiag.widgets, org.eclipse.papyrus.infra.gmfdiag.widgets.editors Bundle-Vendor: %Bundle-Vendor diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.project b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.project index 395ecbac5fc..7b58a3e556d 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.project +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF index 32af3bfaf2e..de490a97f3b 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF @@ -6,27 +6,15 @@ Export-Package: org.eclipse.papyrus.infra.hyperlink, org.eclipse.papyrus.infra.hyperlink.service, org.eclipse.papyrus.infra.hyperlink.ui, org.eclipse.papyrus.infra.hyperlink.util -Require-Bundle: org.eclipse.emf.transaction, - org.eclipse.gmf.runtime.notation;bundle-version="1.8.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.ui, - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.core.filesystem;bundle-version="1.3.200", - org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)", + org.eclipse.papyrus.infra.services.openelement;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml index 4c41e49fef6..40af2f475b4 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.hyperlink</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java index 54416b37cea..ccc4587c580 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java @@ -27,14 +27,29 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.hyperlink"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static final String IMG_LOUPE = "loupe"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static final String IMG_ARROW_UP = "arrowUp"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static final String IMG_ARROW_DOWN = "arrowDown"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static final String IMG_ARROW_LEFT = "arrowLeft"; //$NON-NLS-1$ + /** + * @since 2.0 + */ public static final String IMG_ARROW_RIGHT = "arrowRight"; //$NON-NLS-1$ // The shared instance @@ -71,6 +86,9 @@ public class Activator extends AbstractUIPlugin { return plugin; } + /** + * @since 2.0 + */ @Override protected void initializeImageRegistry(ImageRegistry reg) { super.initializeImageRegistry(reg); @@ -82,6 +100,9 @@ public class Activator extends AbstractUIPlugin { reg.put(IMG_ARROW_RIGHT, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowRight_16x16.gif")); //$NON-NLS-1$ } + /** + * @since 2.0 + */ public Image getIcon(String key) { return getImageRegistry().get(key); } diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java index f52e4158fda..b04b41b196e 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java @@ -18,18 +18,14 @@ import java.util.List; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.window.Window; import org.eclipse.papyrus.infra.core.resource.ModelSet; -import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java index 6d0c4f1def5..e0975e1e5f9 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java @@ -22,6 +22,7 @@ import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject; * a specific element * * @author Shuai Li + * @since 2.0 * */ public interface HyperlinkContributor { diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java index 21f46613089..34f3a9a1716 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java @@ -17,8 +17,9 @@ import org.eclipse.papyrus.infra.core.services.IService; /** * @author Shuai Li + * @since 2.0 * */ public interface HyperlinkService extends IService, HyperlinkContributor { - + } diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java index 3c6b413a37e..40de94d33fd 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java @@ -54,7 +54,7 @@ public class AbstractLookForEditorShell { /** The tree viewcomposite. */ private Composite treeViewcomposite = null; - + private Composite afterTreeViewComposite = null; /** The modeltree. */ @@ -163,14 +163,14 @@ public class AbstractLookForEditorShell { GridData gridData5 = new GridData(); gridData4.horizontalAlignment = GridData.FILL; gridData4.verticalAlignment = GridData.CENTER; - + GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 2; treeViewcomposite = new Composite(cTabFolder, SWT.NONE); treeViewcomposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - + createModelFilteredTree(); - + treeViewcomposite.setLayout(gridLayout); newDiagrambutton = new Button(treeViewcomposite, SWT.NONE); newDiagrambutton.setText(Messages.AbstractLookForEditorShell_New); @@ -181,19 +181,21 @@ public class AbstractLookForEditorShell { cLabel = new CLabel(treeViewcomposite, SWT.NONE); cLabel.setText(" "); //$NON-NLS-1$ cLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - + afterTreeViewComposite = new Composite(treeViewcomposite, SWT.NONE); afterTreeViewComposite.setLayout(new FillLayout()); afterTreeViewComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); afterTreeViewComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); } - + /** * Recursively set the background of all children of parent composite to chosen color + * * @param parent - * The composite that contains children + * The composite that contains children * @param color - * The background color + * The background color + * @since 2.0 */ protected void setChildrenBackground(Composite parent, Color color) { for (Control child : parent.getChildren()) { @@ -370,6 +372,9 @@ public class AbstractLookForEditorShell { return modeFilteredTree; } + /** + * @since 2.0 + */ protected Composite getAfterTreeViewComposite() { return afterTreeViewComposite; } diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java index 8570d849a8d..bb352431fba 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java @@ -109,6 +109,7 @@ public class HyperLinkManagerShell extends AbstractHyperLinkManagerShell { * the uml element linked to the view * @param aview * the aview of the uml element + * @since 2.0 */ public HyperLinkManagerShell(IPageIconsRegistry editorFactoryRegistry, TransactionalEditingDomain domain, EModelElement semanticElement, EModelElement aview, HyperLinkHelperFactory hyperHelperFactory) { super(); diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java index 17dea59555a..c2edfa5f942 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java @@ -58,10 +58,12 @@ public final class HyperLinkConstants { public static final String LEGACY_HYPERLINK_TABLE = PAPYRUS_HYPERLINK_PREFIX + "Table"; public final static String[] validHyperLinkPageSources = new String[] { HyperLinkConstants.PAPYRUS_HYPERLINK_PAGE, HyperLinkConstants.LEGACY_HYPERLINK_DIAGRAM, HyperLinkConstants.LEGACY_HYPERLINK_TABLE }; - + /** * Plugin constants + * + * @since 2.0 */ - + public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".hyperlinkContributor"; } diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java index 61b280efd1e..79a9881fd6d 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java @@ -156,6 +156,9 @@ public class HyperLinkLabelProvider extends LabelProvider { return out; } + /** + * @since 2.0 + */ public static ImageData convertAWTImageToSWT(java.awt.Image image) { if (image == null) { throw new IllegalArgumentException("Null 'image' argument."); @@ -172,6 +175,9 @@ public class HyperLinkLabelProvider extends LabelProvider { return convertToSWT(bi); } + /** + * @since 2.0 + */ public static ImageData convertToSWT(BufferedImage bufferedImage) { if (bufferedImage.getColorModel() instanceof DirectColorModel) { DirectColorModel colorModel = (DirectColorModel) bufferedImage.getColorModel(); @@ -223,6 +229,9 @@ public class HyperLinkLabelProvider extends LabelProvider { return null; } + /** + * @since 2.0 + */ protected InputStream getRawStreamFromURL(URL url) { try { HttpURLConnection connection = (HttpURLConnection) url.openConnection(); diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java index fd52a6222bf..2bba780e0a9 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java @@ -19,18 +19,19 @@ import java.util.List; import java.util.Set; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider; /** * Specific content provider for the tree view of the "views" dialog to choose a diagram for a hyperlink + * + * @since 2.0 */ public class TreeViewContentProvider extends SemanticEMFContentProvider { public TreeViewContentProvider(EObject[] roots) { super(null, null, roots); } - + @Override public boolean hasChildren(Object element) { return super.getChildren(element).length > 0; diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.project b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.project index 230921e2566..204484aaf89 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.project +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF index ecd28c81214..673a5a86517 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF @@ -1,11 +1,10 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.team.core;bundle-version="3.7.0", - org.eclipse.core.resources;bundle-version="3.8.100", - org.eclipse.team.ui;bundle-version="3.7.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.9.0" +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.team.core;bundle-version="[3.7.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.project b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.project index d7026f45772..8893afa1023 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.project +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF index 2ef109f8360..51fad0b2c70 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF @@ -1,12 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;bundle-version="2.11.0", - org.eclipse.emf.transaction;bundle-version="1.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.600" +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)" Export-Package: org.eclipse.papyrus.infra.sync, org.eclipse.papyrus.infra.sync.internal;x-internal:=true, org.eclipse.papyrus.infra.sync.policy, diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.project index 2c06e6705e9..08dbc3cf6ef 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.emf.nattable</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.emf.nattable</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF index dbf05f2fc98..a66b921765c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF @@ -10,28 +10,10 @@ Export-Package: org.eclipse.papyrus.infra.emf.nattable, org.eclipse.papyrus.infra.emf.nattable.registry, org.eclipse.papyrus.infra.emf.nattable.selection, org.eclipse.papyrus.infra.emf.nattable.validator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.emf.ecore;bundle-version="2.9.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.emf.edit, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - ca.odell.glazedlists;bundle-version="1.9.0", - com.google.guava;bundle-version="15.0.0", - org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.project index 7659c2a17b7..f069a73b73a 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.common</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.common</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF index f2228c4aa2b..6f08492aac3 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF @@ -8,31 +8,14 @@ Export-Package: org.eclipse.papyrus.infra.nattable.common, org.eclipse.papyrus.infra.nattable.common.utils, org.eclipse.papyrus.infra.nattable.common.wizards, org.eclipse.papyrus.infra.nattable.internal.common.commands;x-friends:="org.eclipse.papyrus.infra.nattable.gmfdiag" -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.emf.edit, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.emf.transaction, - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.e4.ui.workbench, - org.eclipse.e4.core.contexts, - org.eclipse.core.expressions, - org.eclipse.emf.edit.ui, - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.nattable.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.project index 77f4921949f..c09e975a7cd 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.controlmode</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.controlmode</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF index 6b07b8502b4..247f2b91291 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF @@ -2,18 +2,10 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.nattable.controlmode, org.eclipse.papyrus.infra.nattable.controlmode.commands, org.eclipse.papyrus.infra.nattable.controlmode.helpers -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.project index 13a3ec18604..2fec3d69909 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF index d6e57e98e04..a0dce26b658 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF @@ -1,31 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.emf.edit, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.emf.transaction, - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.e4.ui.workbench, - org.eclipse.e4.core.contexts, - org.eclipse.core.expressions, - org.eclipse.emf.edit.ui, - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.project index 478d1af40ce..5945097d16c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.model.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.model.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF index f28bf8505a5..084ac72666e 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF @@ -1,27 +1,25 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider,
- org.eclipse.papyrus.infra.nattable.model.nattable.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.nattable.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider, + org.eclipse.papyrus.infra.nattable.model.nattable.provider +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.project index 73a89553556..02d501918b1 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.model.editor</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.model.editor</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF index 6cd07c6139c..d8cecaa6e24 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF @@ -1,31 +1,30 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.customeditors,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation,
- org.eclipse.papyrus.infra.nattable.model.nattable.presentation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.customeditors, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation, + org.eclipse.papyrus.infra.nattable.model.nattable.presentation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.project index a3bcea911c8..ee3d5adcfe0 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.model</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.model</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF index 7d0a9df8e2a..f154e000f4f 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF @@ -1,47 +1,46 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.nattable.model,
- org.eclipse.papyrus.infra.nattable.model.factory,
- org.eclipse.papyrus.infra.nattable.model.nattable,
- org.eclipse.papyrus.infra.nattable.model.nattable.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.nattable.model, + org.eclipse.papyrus.infra.nattable.model.factory, + org.eclipse.papyrus.infra.nattable.model.nattable, + org.eclipse.papyrus.infra.nattable.model.nattable.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util, + org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester, + org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl, + org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util, + org.eclipse.papyrus.infra.nattable.model.nattable.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java index e8d022d486a..42a1cc77aaa 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java @@ -1,66 +1,56 @@ -/*****************************************************************************
- * Copyright (c) 2013 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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.nattable.model;
-
-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.infra.nattable.model"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(final BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-}
+/***************************************************************************** + * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.nattable.model; + +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.model"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + @Override + public void start(final BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + @Override + public void stop(final BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } +} diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.project index d459a34bf07..6d3c839e60b 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.modelexplorer</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.modelexplorer</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF index 95c26a1ab4a..79ce697d2a5 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF @@ -8,21 +8,14 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %Bundle-Name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.core.expressions, - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.project index 8dd363f0729..14ba755dfc0 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.properties</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.properties</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF index d6fa554cc91..1409a9db5a0 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF @@ -1,30 +1,11 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.nattable.properties.constraints -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.emf.ecore, - org.eclipse.emf.edit, - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.emf.databinding, - org.eclipse.core.databinding.property;bundle-version="1.4.200", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier @@ -34,4 +15,3 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.properties;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.papyrus.infra.nattable.manager.table diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.project index aa7f080ea05..27325ca1d48 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.views.config</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.views.config</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF index 5ffdd080036..4f3219f3f61 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF @@ -6,26 +6,10 @@ Export-Package: org.eclipse.papyrus.infra.nattable.views.config, org.eclipse.papyrus.infra.nattable.views.config.messages, org.eclipse.papyrus.infra.nattable.views.config.provider, org.eclipse.papyrus.infra.nattable.views.config.utils -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.emf.edit, - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.emf.transaction, - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.project index 511a6616987..fa94a2c2b51 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable.views.editor</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable.views.editor</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF index 475a5c13e1a..1b776635cee 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF @@ -1,21 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0, - 2.0.0)", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.views.config;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.project index 552b9235cf4..1a9a9269122 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.project +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.nattable</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.nattable</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF index f1b46fc86bf..cde8cbf00f0 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF @@ -44,36 +44,21 @@ Export-Package: org.eclipse.papyrus.infra.nattable, org.eclipse.papyrus.infra.nattable.widget, org.eclipse.papyrus.infra.nattable.wizard, org.eclipse.papyrus.infra.nattable.wizard.pages -Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.core.runtime, - org.eclipse.emf.transaction, - org.eclipse.emf.ecore, - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", - org.eclipse.emf.edit, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.swt, - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.emf.edit.ui, - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.core.expressions, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", +Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)", - ca.odell.glazedlists;bundle-version="1.9.0", - org.eclipse.jface.text;bundle-version="3.11.0", - org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0" + ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.project b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.project index d776efd909f..22a932f1c3f 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.project +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/.api_filters b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/.api_filters new file mode 100644 index 00000000000..aec9f42e6f1 --- /dev/null +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.newchild.edit" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="927989779"> + <message_arguments> + <message_argument value="1.2.0"/> + <message_argument value="org.eclipse.emf.edit"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF index 9cd9c5cac4d..d916e0bf467 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF @@ -1,12 +1,11 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.papyrus.infra.filters;visibility:=reexport, - org.eclipse.papyrus.infra.filters.edit;visibility:=reexport +Require-Bundle: org.eclipse.papyrus.infra.newchild;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.project b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.project index b4bef4c924e..2d6920ec3f1 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.project +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF index 0ddfc7b4246..7c241ffae79 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources;visibility:=reexport, +Require-Bundle: org.eclipse.core.resources;visibility:=reexport, org.eclipse.papyrus.infra.newchild.edit;bundle-version="1.2.0";visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, org.eclipse.emf.edit.ui;visibility:=reexport, diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.project b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.project index 44bea73ce9b..48d5c13d8df 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.project +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/.api_filters b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/.api_filters new file mode 100644 index 00000000000..c8136f913e0 --- /dev/null +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.newchild" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="927989779"> + <message_arguments> + <message_argument value="1.2.0"/> + <message_argument value="org.eclipse.papyrus.infra.filters"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF index 94d0fdcbcc3..c6532372d66 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF @@ -4,22 +4,13 @@ Export-Package: org.eclipse.papyrus.infra.newchild, org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl, org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util, org.eclipse.papyrus.infra.newchild.ui -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.filters;visibility:=reexport, - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.semantic;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.semantic;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.project b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.project index ab602231128..8517ba3eee7 100644 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.project +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF index 118b99ce9ac..41670ccc965 100644 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF @@ -2,13 +2,12 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.onefile.model, org.eclipse.papyrus.infra.onefile.providers, org.eclipse.papyrus.infra.onefile.utils -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.core.resources;bundle-version="3.7.0", - org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml index 9d0f4c70d0c..d108c34a47b 100644 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.onefile</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/.api_filters b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/.api_filters new file mode 100644 index 00000000000..e5d1b501163 --- /dev/null +++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/.api_filters @@ -0,0 +1,273 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.elementtypesconfigurations" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractAdviceBindingConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1110441988"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractEditHelperAdviceConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractEditHelperAdviceConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1110441988"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractEditHelperAdviceConfigurationImpl"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractMatcherConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1110441988"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceBindingConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="editHelperAdviceClassName"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getEditHelperAdviceClassName()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setEditHelperAdviceClassName(String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ContainerConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="basicSetContainerMatcherConfiguration(AbstractMatcherConfiguration, NotificationChain)"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getContainerMatcherConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setContainerMatcherConfiguration(AbstractMatcherConfiguration)"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/EditHelperAdviceConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.EditHelperAdviceConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="editHelperAdviceClassName"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getEditHelperAdviceClassName()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setEditHelperAdviceClassName(String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="IDENTIFIER_EDEFAULT"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="NAME_EDEFAULT"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getIdentifier()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getName()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="identifier"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="name"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setIdentifier(String)"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setName(String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeSetConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="IDENTIFIER_EDEFAULT"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="NAME_EDEFAULT"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getIdentifier()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getName()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="identifier"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="name"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setIdentifier(String)"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setName(String)"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsPackageImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractAdviceBindingConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractAdviceBindingConfiguration_ContainerConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractAdviceBindingConfiguration_Inheritance()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractAdviceBindingConfiguration_MatcherConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractAdviceBindingConfiguration_Target()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractEditHelperAdviceConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractEditHelperAdviceConfiguration_Target()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAbstractMatcherConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getAdviceBindingConfiguration_EditHelperAdviceClassName()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getEditHelperAdviceConfiguration_EditHelperAdviceClassName()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getIdentifiedConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getIdentifiedConfiguration_Identifier()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getNamedConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getNamedConfiguration_Name()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/SpecializationTypeConfigurationImpl.java" type="org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl"> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="basicSetEditHelperAdviceConfiguration(AbstractEditHelperAdviceConfiguration, NotificationChain)"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="basicSetMatcherConfiguration(AbstractMatcherConfiguration, NotificationChain)"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getEditHelperAdviceConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="getMatcherConfiguration()"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setEditHelperAdviceConfiguration(AbstractEditHelperAdviceConfiguration)"/> + </message_arguments> + </filter> + <filter comment="Generated impl classes are not client API; the @sinces are already on the interfaces" id="1143996420"> + <message_arguments> + <message_argument value="setMatcherConfiguration(AbstractMatcherConfiguration)"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.project b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.project index 6231831c7de..b0f65a5f995 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.project +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF index 77855375b67..3f08c632558 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.emf.ecore.edit;bundle-version="2.7.0";visibility:=reexport, - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.properties.contexts.provider, org.eclipse.papyrus.infra.properties.environment.provider, org.eclipse.papyrus.infra.properties.ui.provider diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.project b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.project index e56c7f89e12..ff425d9a02c 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.project +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF index 33128f71423..9abbabce6ee 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF @@ -1,13 +1,11 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.emf.edit.ui;visibility:=reexport, - org.eclipse.ui.ide;visibility:=reexport, - org.eclipse.emf.ecore.editor;bundle-version="2.7.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.constraints.editor;bundle-version="1.2.0" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)", + org.eclipse.papyrus.infra.constraints.editor;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.infra.properties.contexts.presentation, org.eclipse.papyrus.infra.properties.environment.presentation, org.eclipse.papyrus.infra.properties.ui.presentation diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.project b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.project index 10139af5ffd..2847895c6c3 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.project +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF index 332d9bb892f..aac5542c36f 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF @@ -18,24 +18,12 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport, - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.core.runtime;bundle-version="3.6.0", - org.eclipse.core.resources;bundle-version="3.6.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.emf.edit;bundle-version="2.8.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.xwt;bundle-version="1.1.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.core.databinding.property;bundle-version="1.6.0" +Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.xwt;bundle-version="[1.1.0,2.0.0)", + org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %Bundle-Vendor Bundle-Version: 1.2.0.qualifier Eclipse-BuddyPolicy: dependent diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.project b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.project index 539260325ab..237b2f34390 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.project +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF index f3c88e1b574..88fe90f274f 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF @@ -11,11 +11,9 @@ Export-Package: org.eclipse.papyrus.infra.properties.catalog, org.eclipse.papyrus.infra.properties.ui, org.eclipse.papyrus.infra.properties.ui.impl, org.eclipse.papyrus.infra.properties.ui.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0" +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project index 93291d8661b..d2002c825a0 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.controlmode.history</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.controlmode.history</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF index 14b152011dd..95df844dafe 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF @@ -1,19 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.7.0"
-Export-Package: org.eclipse.papyrus.infra.services.controlmode.history,
- org.eclipse.papyrus.infra.services.controlmode.history.utils,
- org.eclipse.papyrus.infra.services.controlmode.mm.history,
- org.eclipse.papyrus.infra.services.controlmode.mm.history.impl,
- org.eclipse.papyrus.infra.services.controlmode.mm.history.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.history;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.services.controlmode.history, + org.eclipse.papyrus.infra.services.controlmode.history.utils, + org.eclipse.papyrus.infra.services.controlmode.mm.history, + org.eclipse.papyrus.infra.services.controlmode.mm.history.impl, + org.eclipse.papyrus.infra.services.controlmode.mm.history.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.history;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project index 389c8dc2a8f..d638a12edc3 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.controlmode</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.controlmode</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF index 961f1e00951..bebeb29bf1a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF @@ -4,20 +4,17 @@ Export-Package: org.eclipse.papyrus.infra.services.controlmode, org.eclipse.papyrus.infra.services.controlmode.handler, org.eclipse.papyrus.infra.services.controlmode.participants, org.eclipse.papyrus.infra.services.controlmode.ui, - org.eclipse.papyrus.infra.services.controlmode.util -Require-Bundle: org.eclipse.emf.edit.ui, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" + org.eclipse.papyrus.infra.services.controlmode.util;uses:="org.eclipse.emf.ecore" +Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project index 2c3c2fd73ed..01fdb1ac129 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.decoration</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.decoration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF index f1727611d85..c489ed80064 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF @@ -1,23 +1,18 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.apache.commons.lang;bundle-version="2.4.0",
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.services.decoration,
- org.eclipse.papyrus.infra.services.decoration.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.services.decoration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.decoration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.infra.services.decoration, + org.eclipse.papyrus.infra.services.decoration.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.services.decoration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.decoration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.project index 114ae167f20..86b557d7be3 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF index 4631b1575b8..bfd1505ef91 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF @@ -2,19 +2,11 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.services.edit.internal.ui;x-internal:=true, org.eclipse.papyrus.infra.services.edit.internal.ui.messages;x-internal:=true, org.eclipse.papyrus.infra.services.edit.ui.databinding, - org.eclipse.papyrus.infra.services.edit.ui.dialogs -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.databinding.observable;bundle-version="1.6.0", - org.eclipse.emf.databinding;bundle-version="1.3.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0" + org.eclipse.papyrus.infra.services.edit.ui.dialogs;uses:="org.eclipse.core.runtime,org.eclipse.ui.dialogs,org.eclipse.gmf.runtime.emf.type.core" +Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project index 09ac34ecca3..734560431bb 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.edit</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF index d412c467722..d3e301f8fc4 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF @@ -1,27 +1,22 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.infra.services.edit.commands,
- org.eclipse.papyrus.infra.services.edit.internal;x-internal:=true,
- org.eclipse.papyrus.infra.services.edit.internal.advice;x-internal:=true,
- org.eclipse.papyrus.infra.services.edit.internal.context;x-internal:=true,
- org.eclipse.papyrus.infra.services.edit.internal.matcher;x-internal:=true,
- org.eclipse.papyrus.infra.services.edit.messages,
- org.eclipse.papyrus.infra.services.edit.service,
- org.eclipse.papyrus.infra.services.edit.utils
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.edit, + org.eclipse.papyrus.infra.services.edit.commands, + org.eclipse.papyrus.infra.services.edit.internal;x-internal:=true, + org.eclipse.papyrus.infra.services.edit.internal.advice;x-internal:=true, + org.eclipse.papyrus.infra.services.edit.internal.context;x-internal:=true, + org.eclipse.papyrus.infra.services.edit.internal.matcher;x-internal:=true, + org.eclipse.papyrus.infra.services.edit.messages, + org.eclipse.papyrus.infra.services.edit.service, + org.eclipse.papyrus.infra.services.edit.utils +Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.project index 3fc96f9121b..eb352a0d0a7 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.labelprovider</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.labelprovider</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF index 25398971c3b..7413d92567b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF @@ -1,17 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.labelprovider,
- org.eclipse.papyrus.infra.services.labelprovider.service,
- org.eclipse.papyrus.infra.services.labelprovider.service.impl
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: LabelProvider service
-Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.labelprovider, + org.eclipse.papyrus.infra.services.labelprovider.service, + org.eclipse.papyrus.infra.services.labelprovider.service.impl +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: LabelProvider service +Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.project index 11fb2387944..63bd7a6e9db 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF index 92f853eaa29..e13640ff285 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF @@ -1,20 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.localizer,
- org.eclipse.papyrus.infra.services.localizer.internal;x-internal:=true,
- org.eclipse.papyrus.infra.services.localizer.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="[2.9.0,
- 3.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.localizer, + org.eclipse.papyrus.infra.services.localizer.internal;x-internal:=true, + org.eclipse.papyrus.infra.services.localizer.util +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project index 4e785f6966a..6e3427fc0aa 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.markerlistener</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.markerlistener</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF index f333cbde540..6c88b419696 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF @@ -1,23 +1,18 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.markerlistener,
- org.eclipse.papyrus.infra.services.markerlistener.dialogs,
- org.eclipse.papyrus.infra.services.markerlistener.providers,
- org.eclipse.papyrus.infra.services.markerlistener.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.common.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.7.0",
- org.eclipse.core.expressions;bundle-version="3.4.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.services.markerlistener.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.markerlistener;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.markerlistener, + org.eclipse.papyrus.infra.services.markerlistener.dialogs, + org.eclipse.papyrus.infra.services.markerlistener.providers, + org.eclipse.papyrus.infra.services.markerlistener.util +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.services.markerlistener.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.markerlistener;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.project index af8dab70cde..9f7ad1d624a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.navigation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.navigation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF index 13e90b26c28..cfaf5288e23 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF @@ -1,19 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.navigation,
- org.eclipse.papyrus.infra.services.navigation.provider,
- org.eclipse.papyrus.infra.services.navigation.service
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.jface,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Navigation Service
-Bundle-Activator: org.eclipse.papyrus.infra.services.navigation.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.navigation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.navigation, + org.eclipse.papyrus.infra.services.navigation.provider, + org.eclipse.papyrus.infra.services.navigation.service +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Navigation Service +Bundle-Activator: org.eclipse.papyrus.infra.services.navigation.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.navigation;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.project index a22e556b19b..83b98f2f9ac 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.openelement</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.openelement</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF index 61829247955..c5677b2a3b7 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF @@ -1,23 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.openelement,
- org.eclipse.papyrus.infra.services.openelement.service,
- org.eclipse.papyrus.infra.services.openelement.service.impl
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.100",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: OpenElement Service
-Bundle-Activator: org.eclipse.papyrus.infra.services.openelement.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.openelement;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.openelement, + org.eclipse.papyrus.infra.services.openelement.service, + org.eclipse.papyrus.infra.services.openelement.service.impl +Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.services.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: OpenElement Service +Bundle-Activator: org.eclipse.papyrus.infra.services.openelement.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.openelement;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.project index 291c5bcfcf8..1a840f32cba 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF index 0cdc5618cba..949501e1aca 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF @@ -1,19 +1,10 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.core.resources;bundle-version="3.8.0", - org.eclipse.emf.common.ui;bundle-version="2.7.0", - org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0", - org.eclipse.emf.common;bundle-version="2.12.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.5.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.8.0" +Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project index f89148e28bc..2bd89794f0c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.resourceloading</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.resourceloading</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF index 9ad751a75cf..cf35158b806 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF @@ -1,20 +1,11 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.services.resourceloading, - org.eclipse.papyrus.infra.services.resourceloading.impl, + org.eclipse.papyrus.infra.services.resourceloading.impl;x-internal:=true, org.eclipse.papyrus.infra.services.resourceloading.strategies, org.eclipse.papyrus.infra.services.resourceloading.util -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0", - org.eclipse.core.expressions, - org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.core.resources;bundle-version="3.11.0", - org.eclipse.emf.transaction;bundle-version="1.9.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.8.0", - org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.project index ef69d647090..235beba2f25 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.semantic</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.semantic</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF index bd15e784a04..d2b1fa92b4a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF @@ -1,16 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.semantic,
- org.eclipse.papyrus.infra.services.semantic.service
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: Semantic Service
-Bundle-Activator: org.eclipse.papyrus.infra.services.semantic.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.semantic, + org.eclipse.papyrus.infra.services.semantic.service +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: Semantic Service +Bundle-Activator: org.eclipse.papyrus.infra.services.semantic.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project index ed4b25fa46f..3e2b137f86e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.validation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.validation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF index 433d31aa8c9..72ce56fd8aa 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF @@ -4,22 +4,12 @@ Export-Package: org.eclipse.papyrus.infra.services.validation, org.eclipse.papyrus.infra.services.validation.handler, org.eclipse.papyrus.infra.services.validation.internal;x-friends:="org.eclipse.papyrus.uml.service.validation", org.eclipse.papyrus.infra.services.validation.preferences -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.emf;bundle-version="2.6.0", - org.eclipse.emf.ecore;bundle-version="2.6.1", - org.eclipse.core.resources;bundle-version="3.6.0", - org.eclipse.emf.edit.ui;bundle-version="2.6.0", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.0.100", - org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0" +Require-Bundle: org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.project index 9428a76736f..d8b7fff5f66 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.viewersearch</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.viewersearch</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF index 6b2e54794d8..e443264c43a 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF @@ -1,16 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.viewersearch,
- org.eclipse.papyrus.infra.services.viewersearch.impl
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0"
-Bundle-Vendor: %vendorName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.services.viewersearch.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewersearch;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.services.viewersearch, + org.eclipse.papyrus.infra.services.viewersearch.impl +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %vendorName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.services.viewersearch.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewersearch;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.project index e9b5b2bfc0b..85623321336 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.project +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.services.viewlabelprovider</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.services.viewlabelprovider</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF index ea9138f8792..441269ba502 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF @@ -1,18 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0"
-Bundle-Vendor: %vendorName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.services.viewlabelprovider.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewlabelprovider;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)" +Bundle-Vendor: %vendorName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.services.viewlabelprovider.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewlabelprovider;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.project index 1ff0577ad7b..8803436bf81 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.project +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.types.core</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.types.core</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF index 0bd7772f3da..6e532b2b4a9 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF @@ -1,29 +1,24 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.types;bundle-version="1.2.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.types.core,
- org.eclipse.papyrus.infra.types.core.extensionpoints,
- org.eclipse.papyrus.infra.types.core.factories,
- org.eclipse.papyrus.infra.types.core.factories.impl,
- org.eclipse.papyrus.infra.types.core.impl,
- org.eclipse.papyrus.infra.types.core.notification,
- org.eclipse.papyrus.infra.types.core.notification.events,
- org.eclipse.papyrus.infra.types.core.registries,
- org.eclipse.papyrus.infra.types.core.utils
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.types.core.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.types.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.types.core, + org.eclipse.papyrus.infra.types.core.extensionpoints, + org.eclipse.papyrus.infra.types.core.factories, + org.eclipse.papyrus.infra.types.core.factories.impl, + org.eclipse.papyrus.infra.types.core.impl, + org.eclipse.papyrus.infra.types.core.notification, + org.eclipse.papyrus.infra.types.core.notification.events, + org.eclipse.papyrus.infra.types.core.registries, + org.eclipse.papyrus.infra.types.core.utils +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 2.0.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.types.core.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.types.core;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml index affbc6c6eb8..c0037f2b170 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.types.core</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project index 83a370a8728..ca506a5d478 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.types.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.types.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF index 0821d2166a6..ccae9f27e4c 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.types.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.types;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.types;bundle-version="1.2.0";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.types.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.types.provider +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.types.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml index f5a3f6077da..abbee0eae5a 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.types.edit</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.project index 415647bf396..f77ad97bd55 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.project +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.types.editor</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.types.editor</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF index 23729b9058f..94d9ccb0490 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF @@ -1,18 +1,17 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.types.presentation
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.types.presentation.TypesConfigurationsEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.types.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.types.presentation +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.types.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.types.presentation.TypesConfigurationsEditorPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.types.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml index bd708807baf..64753857bcd 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.types.editor</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.project index 98406c46699..41b9b86c901 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.project +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.types.rulebased</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.types.rulebased</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF index 792e20ed053..e3fc2c5d002 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF @@ -1,28 +1,20 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.papyrus.infra.types;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="1.2.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.types.rulebased,
- org.eclipse.papyrus.infra.types.rulebased.core,
- org.eclipse.papyrus.infra.types.rulebased.impl,
- org.eclipse.papyrus.infra.types.rulebased.provider,
- org.eclipse.papyrus.infra.types.rulebased.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.types.rulebased;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.types.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.types.rulebased, + org.eclipse.papyrus.infra.types.rulebased.core, + org.eclipse.papyrus.infra.types.rulebased.impl, + org.eclipse.papyrus.infra.types.rulebased.provider, + org.eclipse.papyrus.infra.types.rulebased.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 2.0.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.infra.types.rulebased;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml index 6d00b665fc3..d69d153fc30 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.types.rulebased</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.project index 96400fd6e2c..71ed332df91 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.project +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF index f02c36cc9fa..dcc4f11dc4e 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF @@ -1,17 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui;bundle-version="3.100.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.types.core.internal.ui;x-internal:=true,
- org.eclipse.papyrus.infra.types.core.internal.ui.handlers;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.types.core.internal.ui;x-internal:=true, + org.eclipse.papyrus.infra.types.core.internal.ui.handlers;x-internal:=true +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 2.0.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml index 6bc9f5afdd9..0610d5744f2 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.types.ui</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types/.project index 5f09a69ab49..92b1a2fe9de 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/.project +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF index 4e885cb3f8a..af1a267a768 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.types;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,7 +11,6 @@ Export-Package: org.eclipse.papyrus.infra.types, org.eclipse.papyrus.infra.types.impl, org.eclipse.papyrus.infra.types.resource, org.eclipse.papyrus.infra.types.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml index eebc22ebb9f..e23b7c23ca7 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.types</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project index 2520b07362d..69e45711329 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF index fc586354cf3..2778749b3a0 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF @@ -7,22 +7,17 @@ Export-Package: org.eclipse.papyrus.infra.onefile.internal.ui;x-internal:=true, org.eclipse.papyrus.infra.onefile.internal.ui.testers;x-internal:=true, org.eclipse.papyrus.infra.onefile.ui.providers, org.eclipse.papyrus.infra.onefile.ui.utils -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.ui.navigator, - org.eclipse.ui.navigator.resources, - org.eclipse.core.resources;bundle-version="3.7.0", - org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.ui, - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.ltk.core.refactoring;bundle-version="3.6.0", - org.eclipse.ltk.ui.refactoring;bundle-version="3.7.0", - org.eclipse.core.filesystem;bundle-version="1.4.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.core.expressions, - org.eclipse.emf.ecore;bundle-version="2.12.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ltk.ui.refactoring;bundle-version="[3.8.0,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project index 1233f09c6e8..a09450dc6f9 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF index e4d2acb77b8..7652d13951c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF @@ -1,16 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.ltk.core.refactoring;bundle-version="3.5.200", - org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project index 9943e4559d6..52e1464192e 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project @@ -20,10 +20,34 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF index 9448f025be2..46d33f813eb 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF @@ -25,24 +25,14 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.ui;bundle-version="3.107.0", - org.eclipse.core.runtime;bundle-version="3.10.0", - org.eclipse.core.expressions;bundle-version="3.4.600", - org.eclipse.emf.ecore, - org.eclipse.emf.transaction, - com.google.guava;bundle-version="11.0.0", - org.eclipse.core.databinding;bundle-version="1.6.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.12.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.emf.edit.ui;bundle-version="2.12.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.7.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)", + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.views;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-Version: 1.2.0.qualifier Eclipse-BuddyPolicy: dependent @@ -51,4 +41,3 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator Bundle-Description: Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies. Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true -Import-Package: org.eclipse.papyrus.infra.emf.utils diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java index 9145151e8a0..c80791a8047 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java @@ -44,6 +44,8 @@ import org.eclipse.ui.handlers.HandlerUtil; * (the command is now shown in menu if not executable). * * </pre> + * + * @since 1.2 */ public abstract class AbstractCommandHandler extends AbstractPapyrusHandler { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java index d77ab4240be..50982feedd2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java @@ -36,6 +36,8 @@ import org.eclipse.ui.handlers.HandlerUtil; /** * This provides facilities to get the TransactionEditingDomain and the PageManager from * the current Papyrus editor or view context. + * + * @since 1.2 */ public abstract class AbstractPapyrusHandler extends AbstractHandler { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java index 1fb84925184..04b104f3931 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java @@ -22,6 +22,9 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.ui.extension.diagrameditor.EditorDescriptorExtensionFactory; import org.osgi.framework.Bundle; +/** + * @since 1.2 + */ public class ContentOutlineRegistry { /** ID of the editor extension (schema filename) */ diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java index 8ce4fd3985f..c4034592c45 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java @@ -18,6 +18,8 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; /** * Extends the original interface to add the init method. + * + * @since 1.2 */ public interface IPapyrusContentOutlinePage extends org.eclipse.ui.views.contentoutline.IContentOutlinePage { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java index 833f0ef89fb..9985bb1e393 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java @@ -66,6 +66,8 @@ import com.google.common.collect.Lists; /** * Page for Papyrus outline when active nested editor is a GMF editor + * + * @since 1.2 */ public class NestedEditorDelegatedOutlinePage extends Page implements IPapyrusContentOutlinePage, IPageLifeCycleEventsListener, IEditorReloadListener { @@ -107,7 +109,7 @@ public class NestedEditorDelegatedOutlinePage extends Page implements IPapyrusCo } private void internalInit(IMultiDiagramEditor multiEditor) { - sashWindowsContainer = (ISashWindowsContainer) multiEditor.getAdapter(ISashWindowsContainer.class); + sashWindowsContainer = multiEditor.getAdapter(ISashWindowsContainer.class); sashWindowsContainer.addPageLifeCycleListener(this); } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java index 02e1f24f92c..2d944c254d0 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java @@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.ui.messages.Messages; * Abstract class for String value Container * * @author VL222926 + * @since 1.2 * */ public abstract class AbstractStringValueConverter implements IStringValueConverter { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java index 657091fb03c..d8d23b85910 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IStatus; * This class allows to store the value created for a pasted String AND a result status associated to this pasted String * * @param <T> + * @since 1.2 */ public class ConvertedValueContainer<T> { @@ -57,7 +58,7 @@ public class ConvertedValueContainer<T> { /** * * @return - * the status of the conversion + * the status of the conversion */ public final IStatus getStatus() { return this.status; @@ -66,7 +67,7 @@ public class ConvertedValueContainer<T> { /** * * @return - * the value + * the value */ public final T getConvertedValue() { return this.value; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java index 2847e7180fa..9873eabe2c5 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java @@ -38,6 +38,7 @@ import org.eclipse.papyrus.infra.ui.Activator; * WARNING : incomplete implementations * * @author vl222926 + * @since 1.2 * */ diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java index 5ce086d2dd7..465c93c63f6 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java @@ -19,6 +19,7 @@ import org.eclipse.ui.services.IDisposable; * Common interface for string converter * * @author VL222926 + * @since 1.2 * */ public interface IStringValueConverter extends IDisposable { @@ -30,7 +31,7 @@ public interface IStringValueConverter extends IDisposable { * @param valueAsString * the value represented by a string * @return - * a {@link ConvertedValueContainer} + * a {@link ConvertedValueContainer} */ public ConvertedValueContainer<?> deduceValueFromString(final Object type, final String valueAsString); } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java index 4324d0191fa..13ed47393c1 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IStatus; * This class allows to store the value created for a pasted String AND a result status associated to this pasted String * * @param <T> + * @since 1.2 */ public class MultiConvertedValueContainer<T> extends ConvertedValueContainer<Collection<T>> { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java index 979bc06460c..0ef71f811ec 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status; * This status is used y the String Value solvers * * @author vl222926 + * @since 1.2 * */ public class StringValueConverterStatus extends Status { @@ -52,7 +53,7 @@ public class StringValueConverterStatus extends Status { /** * * @return - * the list of the unresolved string + * the list of the unresolved string */ public final Collection<String> getUnresolvedString() { return unresolvedString; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java index a31e0562b90..5691b5a9c30 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java @@ -21,6 +21,8 @@ import org.eclipse.swt.dnd.TransferData; * A local transfer carrying a single object being dragged. Subclasses should maintain a * single instance of their Transfer and provide a static method to obtain that * instance. + * + * @since 1.2 */ public abstract class PapyrusTransfer<T> extends ByteArrayTransfer { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java index 49557e36432..871c560bc33 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java @@ -14,6 +14,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry; * This service depends on {@link DiSashModelMngrServiceFactory}. * * @author cedric dumoulin + * @since 1.2 * */ public class ContentProviderServiceFactory implements IServiceFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java index bbfb16f40a6..b6a33a1dca9 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java @@ -125,7 +125,7 @@ import com.google.common.collect.ImmutableSet; * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> * Refactoring. * - * TODO : remove GMF dependency ! + * @since 1.2 */ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IGotoMarker, IEditingDomainProvider { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java index 1f13fedb84b..16a4ba5b393 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java @@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFacto * Service Factory to create the {@link DiSashModelManager} service. * * @author cedric dumoulin + * @since 1.2 * */ public class DiSashModelManagerServiceFactory implements IServiceFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java index ad0806cff77..b19e9c6f061 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java @@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFacto * Service Factory to create the {@link DiSashModelMngr} service. * * @author cedric dumoulin + * @since 1.2 * */ public class DiSashModelMngrServiceFactory implements IServiceFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java index 4193c25cf3e..8b82dd17ba2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java @@ -31,6 +31,7 @@ import org.eclipse.ui.IEditorSite; * TODO remove extends IEditingDomainProvider. This interface should be * independant of any technology (EMF, GMF, ...). If the EditingDomain * is required, it can be retrieved by the registry. + * @since 1.2 * */ public interface IMultiDiagramEditor extends IEditorPart { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java index 50594efbec8..db373887090 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java @@ -18,6 +18,7 @@ import org.eclipse.ui.IEditorInput; * An IEditorInput used to reference the page(s) to open * * @author Camille Letavernier + * @since 1.2 * */ public interface IPapyrusPageInput extends IEditorInput { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java index 92bff539cf7..eb06f6ec609 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java @@ -50,6 +50,8 @@ import org.eclipse.ui.ide.IDE; /** * An {@linkplain IAdaptable adapter protocol} for editors that know how to internally * reload themselves without disturbing the workbench window's perspective layout. + * + * @since 1.2 */ public interface IReloadableEditor { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java index c35a776b83a..f3ffaddaa2c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java @@ -15,6 +15,7 @@ import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFacto * Service Factory to register {@link IPageIconsRegistry}. * * @author cedric dumoulin + * @since 1.2 * */ public class PageIconRegistryServiceFactory implements IServiceFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java index b7657e6ce1a..6113642a206 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java @@ -25,6 +25,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry; * serviceFactory depends on {@link ISashWindowsContentProvider} service. * * @author cedric dumoulin + * @since 1.2 * */ public class PageMngrServiceFactory implements IServiceFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java index 84d317fc793..8a53236b096 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java @@ -19,6 +19,7 @@ import org.eclipse.ui.part.FileEditorInput; * Basic implementation of {@link IPapyrusPageInput} * * @author Camille Letavernier + * @since 1.2 */ public class PapyrusPageInput extends FileEditorInput implements IPapyrusPageInput { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java index 3eabad5cbf3..c78f105052e 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java @@ -26,6 +26,8 @@ import com.google.common.collect.Lists; * An {@linkplain EditorReloadEvent#putContext(Object) editor reload context} that composes other reload contexts. * This should be used whenever a {@linkplain IReloadContextProvider reload context provider} supplies multiple * reload contexts, to ensure that they are properly initialized by the reload system. + * + * @since 1.2 */ public class CompositeReloadContext implements IDisposableReloadContext, IAdaptable { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java index 718b376c2ba..386e1722ff2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java @@ -20,6 +20,8 @@ import org.eclipse.papyrus.infra.core.utils.AdapterUtils; * An {@linkplain EditorReloadEvent#putContext(Object) editor reload context} that delegates to another reload context. * This should be used whenever a {@linkplain IReloadContextProvider reload context provider} is needed to get a reload * context to delegate to. + * + * @since 1.2 */ public class DelegatingReloadContext implements IDisposableReloadContext, IAdaptable { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java index e8eea1033cc..d5422e8c6b1 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java @@ -19,6 +19,8 @@ import org.eclipse.jface.viewers.ISelectionProvider; /** * A convenient selection re-load context for UIs that present EMF-based content. + * + * @since 1.2 */ public class EMFSelectionContext extends SelectionContext<ISelectionProvider, URI> implements IAdaptable { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java index a6f99008f06..0d19a72c918 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java @@ -19,6 +19,8 @@ import org.eclipse.jface.viewers.AbstractTreeViewer; /** * A convenient context object for {@link IEditorReloadListener}s to store in an {@link EditorReloadEvent} to capture and restore * the expansion and selection state of nodes in an EMF-based tree viewer. + * + * @since 1.2 */ public class EMFTreeViewerContext extends TreeViewerContext<URI> implements IAdaptable { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java index 5015f26011e..3d14182deb9 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java @@ -16,6 +16,8 @@ package org.eclipse.papyrus.infra.ui.editor.reload; /** * Convenience superclass for selective implementation of editor reload call-backs. + * + * @since 1.2 */ public class EditorReloadAdapter implements IEditorReloadListener { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java index c4d13f721b4..f608977a4c6 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java @@ -31,6 +31,8 @@ import com.google.common.collect.Maps; /** * The event object for notifications of each phase in the reloading of a {@linkplain IReloadableEditor reloadable editor}. + * + * @since 1.2 */ public class EditorReloadEvent extends EventObject { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java index 8aff9ccf83b..169856e099d 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java @@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.ui.editor.reload; * Protocol implemented by {@link EditorReloadEvent} context objects that must be disposed when they are no longer needed. * * @see EditorReloadEvent#dispose() + * @since 1.2 */ public interface IDisposableReloadContext { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java index 2114d555152..e8530c3b6f1 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java @@ -19,6 +19,8 @@ import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor; /** * A protocol for notification of the phases of re-loading of an {@link IReloadableEditor}. + * + * @since 1.2 */ public interface IEditorReloadListener extends EventListener { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java index f3449f59be9..5060a182de7 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java @@ -17,6 +17,8 @@ package org.eclipse.papyrus.infra.ui.editor.reload; * An adapter protocol for objects that can provide {@code context}s to be included in the * re-load state of dependent parts in an {@link EditorReloadEvent}, for the purpose of * restoring the state of those objects after re-load has completed. + * + * @since 1.2 */ public interface IReloadContextProvider { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java index 15d58b5c4a1..a8ba56f2b0e 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java @@ -28,6 +28,7 @@ import com.google.common.collect.Lists; * the type of selection provider * @param <T> * the type of token used to restore the selection state + * @since 1.2 */ public abstract class SelectionContext<V extends ISelectionProvider, T> { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java index 6d70788326c..1e787d60645 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java @@ -23,6 +23,8 @@ import com.google.common.collect.Lists; /** * A convenient context object for {@link IEditorReloadListener}s to store in an {@link EditorReloadEvent} to capture and restore * the expansion and selection state of nodes in a tree viewer. + * + * @since 1.2 */ public abstract class TreeViewerContext<T> extends SelectionContext<AbstractTreeViewer, T> { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java index 9c02a4bf35d..06c1aa334b3 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java @@ -17,13 +17,12 @@ package org.eclipse.papyrus.infra.ui.editorsfactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; -import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry; -import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistryExtended; -import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry; /** * * An abstract class to get the iconRegistery + * + * @since 1.2 * */ public abstract class AbstractGetEditorIconQuery {// we don't need to implements IJavaModelQuery here diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java index a107a8e53ff..406a9d496c8 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java @@ -11,6 +11,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; * * * @author cedric dumoulin + * @since 1.2 * */ public interface IEditorFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java index 16ea36ce42b..f419d6ba65c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java @@ -17,6 +17,7 @@ import org.eclipse.swt.graphics.Image; * * * @author cedric dumoulin + * @since 1.2 * */ public interface IEditorIconFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java index 52faed51ce4..960b7cf0fee 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java @@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.ui.editorsfactory; /** * * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>" + * @since 1.2 * */ public interface IEditorIconFactoryExtended extends IEditorIconFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java index 4063f28288c..f26b2b42374 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java @@ -19,6 +19,7 @@ import org.eclipse.swt.graphics.Image; * Registry used to get Icons associated to an editor. * * @author cedric dumoulin + * @since 1.2 */ public interface IPageIconsRegistry { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java index a11b5f5e7ff..d3b5c41cb18 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java @@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.ui.editorsfactory; * Extends IPageIconsRegistry in order to offer a second methods which will give back the URL of the requested Icon * * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>" + * @since 1.2 * */ public interface IPageIconsRegistryExtended extends IPageIconsRegistry { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java index d60e8f71f96..9f718718876 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java @@ -14,6 +14,7 @@ import org.eclipse.swt.graphics.Image; * * * @author cedric dumoulin + * @since 1.2 */ public class PageIconsRegistry implements IPageIconsRegistryExtended { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java index 32774bb7a25..e3d2599a26d 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java @@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.ui.Activator; * * * @author cedric dumoulin + * @since 1.2 */ public class PageModelFactoryRegistry implements IPageModelFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java index 035cfbfda70..7635aa56deb 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java @@ -14,6 +14,9 @@ package org.eclipse.papyrus.infra.ui.extension.commands; import org.eclipse.emf.ecore.EObject; +/** + * @since 1.2 + */ public interface ICreationCondition { /** diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java index 8b7f371b28e..838908b38c2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java @@ -17,6 +17,8 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet; /** * The Interface IModelCreationCommand. + * + * @since 1.2 */ public interface IModelCreationCommand { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java index 0c8b0a9d9fe..c80e607bc65 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java @@ -15,7 +15,10 @@ package org.eclipse.papyrus.infra.ui.extension.commands; import org.eclipse.emf.ecore.EObject; -//FIXME Refactoring Juno : I don't know how to migrate this code +/** + * @since 1.2 + */ +// FIXME Refactoring Juno : I don't know how to migrate this code public class PerspectiveContextDependence implements ICreationCondition { protected String commandID = null; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java index 89ace2da204..387875def4a 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java @@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory; * @author Remi Schnekenburger * @author Patrick Tessier * @author cedric dumoulin + * @since 1.2 */ public abstract class AbstractEditorFactory implements IPluggableEditorFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java index d7aa6d558eb..9b33a748473 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java @@ -21,6 +21,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; * to know about the nested diagram. It is fill by an extension. * * @author Cedric Dumoulin + * @since 1.2 * */ public class EditorDescriptor { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java index 8d57b2fe3ab..99df6818407 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java @@ -26,6 +26,7 @@ import org.eclipse.papyrus.infra.ui.Activator; * * @author Cedric Dumoulin * @author Patrick Tessier + * @since 1.2 */ public class EditorDescriptorExtensionFactory extends ExtensionUtils { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java index 8a80509bda2..419fda5a4bd 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java @@ -13,6 +13,7 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory; * by the {@link PluggableEditorFactoryReader} * * @author cedric dumoulin + * @since 1.2 * */ public class EditorFactoryProxy implements IEditorFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java index 94038633af4..4451322b7fb 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java @@ -12,6 +12,7 @@ import org.eclipse.swt.graphics.Image; * common ancestor for {@link EditorIconFactory} and {@link EditorFactoryProxy} * * @author cedric dumoulin + * @since 1.2 * */ public class EditorIconFactory implements IEditorIconFactoryExtended { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java index f0e189ae4e1..6b4e35b2397 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java @@ -17,6 +17,7 @@ package org.eclipse.papyrus.infra.ui.extension.diagrameditor; * Editor was not found. * * @author dumoulin + * @since 1.2 * */ @SuppressWarnings("serial") diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java index 87f1cde5d2b..ce20bfff652 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java @@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory; * editor data. * * @author C�dric Dumoulin + * @since 1.2 * */ public interface IPluggableEditorFactory extends IEditorFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java index fd6a89ff037..12504d37327 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java @@ -17,6 +17,7 @@ package org.eclipse.papyrus.infra.ui.extension.diagrameditor; * Root Exception of MultiDiagram exception * * @author dumoulin + * @since 1.2 * */ @SuppressWarnings("serial") diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java index 75dc1d7cc96..739e9b38711 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java @@ -29,6 +29,8 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.PageModelFactoryRegistry; /** * This reader is used to read PluggableEditorFactory from the Eclipse extension * declarations. It can be used to populate an {@link PageModelFactoryRegistry}. + * + * @since 1.2 */ public class PluggableEditorFactoryReader { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java index 51e34e85d83..13297f74b46 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java @@ -10,6 +10,7 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; * Event sent whith a Save or SaveAs. * * @author cedric dumoulin + * @since 1.2 * */ public class DoSaveEvent { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java index 64835143e55..b446aa55637 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java @@ -21,6 +21,7 @@ import org.eclipse.ui.part.FileEditorInput; * event after a call to {@link ISaveAndDirtyService#doSaveAs()}. * * @author cedric dumoulin + * @since 1.2 * */ public interface IEditorInputChangedListener { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java index 31f2afae670..78f34636a02 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java @@ -8,6 +8,7 @@ package org.eclipse.papyrus.infra.ui.lifecycleevents; * lifecycle events. This interface is the "public" part of the {@link LifeCycleEventsProvider}. * * @author cedric dumoulin + * @since 1.2 * */ public interface ILifeCycleEventsProvider { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java index a93b164ea0d..6eeb3324c3c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java @@ -19,6 +19,7 @@ import org.eclipse.ui.ISaveablePart; /** * @author dumoulin + * @since 1.2 * */ public interface ISaveAndDirtyService extends ISaveablePart { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java index 03d6aaa6a02..9c2a393dc5a 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java @@ -10,6 +10,7 @@ package org.eclipse.papyrus.infra.ui.lifecycleevents; * * @param <T> * Type of event passed to methods. + * @since 1.2 */ public interface ISaveEventListener { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java index 3fb4e594271..95c42ca2e08 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java @@ -19,6 +19,7 @@ import java.util.List; * * * @author cedric dumoulin + * @since 1.2 * */ public class LifeCycleEventsProvider implements ILifeCycleEventsProvider { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java index b9126079262..04d5524fe49 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java @@ -24,6 +24,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry; * serviceFactory depends on {@link SaveAndDirtyService} service. * * @author cedric dumoulin + * @since 1.2 * */ public class LifeCycleEventsProviderServiceFactory implements IServiceFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java index 7e858153695..586e0b9a9f7 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java @@ -69,6 +69,7 @@ import org.eclipse.ui.part.FileEditorInput; * hasn't changed. * * @author cedric dumoulin + * @since 1.2 * */ public class SaveAndDirtyService extends LifeCycleEventsProvider implements ISaveablePart, IService, ISaveAndDirtyService { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java index 3af4448ed36..e7cf5b39910 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java @@ -22,6 +22,7 @@ import org.eclipse.ui.part.EditorActionBarContributor; * * @author Cedric Dumoulin * @author Patrick Tessier + * @since 1.2 * */ public class ActionBarContributorDescriptor { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java index da949ab92ae..502a8c291e7 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java @@ -25,6 +25,7 @@ import org.eclipse.ui.part.EditorActionBarContributor; * * @author Cedric Dumoulin * @auhtor Patrick Tessier + * @since 1.2 */ public class ActionBarContributorExtensionFactory extends ExtensionUtils { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java index 347e1e0d5c7..5dc8ca34b2f 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java @@ -34,6 +34,7 @@ import org.eclipse.ui.part.EditorActionBarContributor; * ActionBarContributor declared in Eclipse extension mechanism. * * @author dumoulin + * @since 1.2 * */ public class ActionBarContributorRegistry implements IActionBarContributorFactory, IService { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java index 2e8459fe5cf..c9e4cbebfe4 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java @@ -31,6 +31,7 @@ import org.eclipse.ui.part.EditorActionBarContributor; * editor in a MultiPageEditor environement. * * @author dumoulin + * @since 1.2 * */ public class CoreComposedActionBarContributor extends ComposedActionBarContributor implements IMultiPageEditorActionBarContributor { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java index e296d88deab..bf2e6864705 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java @@ -10,6 +10,7 @@ import org.eclipse.ui.part.EditorActionBarContributor; * Interface used to get an ActionBarContributor from its ID. * * @author dumoulin + * @since 1.2 * */ public interface IActionBarContributorFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java index 13426ddc474..a2ad07fb5ed 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java @@ -45,6 +45,8 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore; * Each group added has to be declared through the {@link #addPreferenceGroup(AbstractPreferenceGroup)}</code> method</li> * </ul> * </p> + * + * @since 1.2 */ public abstract class AbstractPapyrusPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage, IPapyrusPreferencePage { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java index 922fd74b9c3..e033ba696ec 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java @@ -22,6 +22,9 @@ import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.papyrus.infra.ui.Activator; import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog; +/** + * @since 1.2 + */ public abstract class AbstractPapyrusPreferenceStore extends PapyrusScopedPreferenceStore { /** diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java index b90d098e54b..4079a5903b3 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java @@ -26,6 +26,8 @@ import org.eclipse.swt.widgets.Composite; /** * The Class AbstractPreferenceGroup. + * + * @since 1.2 */ public abstract class AbstractPreferenceGroup extends Composite { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java index 4a82d671fef..f941d7abea3 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java @@ -19,6 +19,8 @@ import org.eclipse.jface.preference.IPreferencePage; /** * Specialized protocol for preference pages participating in the {@link VisiblePageSingleton} * mechanism. + * + * @since 1.2 */ public interface IPapyrusPreferencePage extends IPreferencePage { /** diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java index f3ec34c88c1..07cbf3a6f37 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java @@ -65,7 +65,7 @@ import org.osgi.service.prefs.BackingStoreException; * </p> * * @see org.eclipse.core.runtime.preferences - * @since 3.1 + * @since 1.2 */ public class PapyrusScopedPreferenceStore extends EventManager implements IPreferenceStore, IPersistentPreferenceStore { @@ -165,6 +165,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#added(org.eclipse.core.runtime.preferences.IEclipsePreferences * .NodeChangeEvent) */ + @Override public void added(NodeChangeEvent event) { if (nodeQualifier.equals(event.getChild().name()) && isListenerAttached()) { getStorePreferences().addPreferenceChangeListener(preferencesListener); @@ -177,6 +178,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#removed(org.eclipse.core.runtime.preferences. * IEclipsePreferences.NodeChangeEvent) */ + @Override public void removed(NodeChangeEvent event) { // Do nothing as there are no events from removed node } @@ -196,6 +198,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime. * preferences.IEclipsePreferences.PreferenceChangeEvent) */ + @Override public void preferenceChange(PreferenceChangeEvent event) { if (silentRunning) { @@ -272,6 +275,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { initializePreferencesListener();// Create the preferences listener if it // does not exist @@ -351,6 +355,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String) */ + @Override public boolean contains(String name) { if (name == null) { return false; @@ -364,6 +369,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, * java.lang.Object, java.lang.Object) */ + @Override public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) { // important: create intermediate array to protect against listeners // being added/removed during the notification @@ -376,10 +382,11 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe final IPropertyChangeListener listener = (IPropertyChangeListener) list[i]; SafeRunner.run(new SafeRunnable(JFaceResources.getString("PreferenceStore.changeError")) { //$NON-NLS-1$ - public void run() { - listener.propertyChange(event); - } - }); + @Override + public void run() { + listener.propertyChange(event); + } + }); } } @@ -388,6 +395,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String) */ + @Override public boolean getBoolean(String name) { String value = internalGet(name); return value == null ? BOOLEAN_DEFAULT_DEFAULT : Boolean.valueOf(value).booleanValue(); @@ -398,6 +406,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String) */ + @Override public boolean getDefaultBoolean(String name) { return getDefaultPreferences().getBoolean(name, BOOLEAN_DEFAULT_DEFAULT); } @@ -407,6 +416,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String) */ + @Override public double getDefaultDouble(String name) { return getDefaultPreferences().getDouble(name, DOUBLE_DEFAULT_DEFAULT); } @@ -416,6 +426,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String) */ + @Override public float getDefaultFloat(String name) { return getDefaultPreferences().getFloat(name, FLOAT_DEFAULT_DEFAULT); } @@ -425,6 +436,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String) */ + @Override public int getDefaultInt(String name) { return getDefaultPreferences().getInt(name, INT_DEFAULT_DEFAULT); } @@ -434,6 +446,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String) */ + @Override public long getDefaultLong(String name) { return getDefaultPreferences().getLong(name, LONG_DEFAULT_DEFAULT); } @@ -443,6 +456,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String) */ + @Override public String getDefaultString(String name) { return getDefaultPreferences().get(name, STRING_DEFAULT_DEFAULT); } @@ -452,6 +466,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String) */ + @Override public double getDouble(String name) { String value = internalGet(name); if (value == null) { @@ -482,6 +497,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String) */ + @Override public float getFloat(String name) { String value = internalGet(name); if (value == null) { @@ -499,6 +515,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String) */ + @Override public int getInt(String name) { String value = internalGet(name); if (value == null) { @@ -516,6 +533,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String) */ + @Override public long getLong(String name) { String value = internalGet(name); if (value == null) { @@ -533,6 +551,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String) */ + @Override public String getString(String name) { String value = internalGet(name); return value == null ? STRING_DEFAULT_DEFAULT : value; @@ -543,6 +562,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String) */ + @Override public boolean isDefault(String name) { if (name == null) { return false; @@ -555,6 +575,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving() */ + @Override public boolean needsSaving() { return dirty; } @@ -565,6 +586,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, * java.lang.String) */ + @Override public void putValue(String name, String value) { try { // Do not notify listeners @@ -582,6 +604,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { removeListenerObject(listener); if (!isListenerAttached()) { @@ -595,6 +618,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * double) */ + @Override public void setDefault(String name, double value) { getDefaultPreferences().putDouble(name, value); } @@ -605,6 +629,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * float) */ + @Override public void setDefault(String name, float value) { getDefaultPreferences().putFloat(name, value); } @@ -615,6 +640,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * int) */ + @Override public void setDefault(String name, int value) { getDefaultPreferences().putInt(name, value); } @@ -625,6 +651,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * long) */ + @Override public void setDefault(String name, long value) { getDefaultPreferences().putLong(name, value); } @@ -635,6 +662,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * java.lang.String) */ + @Override public void setDefault(String name, String defaultObject) { getDefaultPreferences().put(name, defaultObject); } @@ -645,6 +673,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, * boolean) */ + @Override public void setDefault(String name, boolean value) { getDefaultPreferences().putBoolean(name, value); } @@ -654,6 +683,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String) */ + @Override public void setToDefault(String name) { String oldValue = getString(name); @@ -680,6 +710,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * double) */ + @Override public void setValue(String name, double value) { double oldValue = getDouble(name); if (oldValue == value) { @@ -705,6 +736,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * float) */ + @Override public void setValue(String name, float value) { float oldValue = getFloat(name); if (oldValue == value) { @@ -730,6 +762,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * int) */ + @Override public void setValue(String name, int value) { int oldValue = getInt(name); if (oldValue == value) { @@ -755,6 +788,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * long) */ + @Override public void setValue(String name, long value) { long oldValue = getLong(name); if (oldValue == value) { @@ -780,6 +814,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * java.lang.String) */ + @Override public void setValue(String name, String value) { // Do not turn on silent running here as Strings are propagated if (getDefaultString(name).equals(value)) { @@ -796,6 +831,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, * boolean) */ + @Override public void setValue(String name, boolean value) { boolean oldValue = getBoolean(name); if (oldValue == value) { @@ -820,6 +856,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe * * @see org.eclipse.jface.preference.IPersistentPreferenceStore#save() */ + @Override public void save() throws IOException { try { getStorePreferences().flush(); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java index 7fafd1364aa..f0c1325de2b 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java @@ -19,6 +19,8 @@ import org.eclipse.jface.preference.IPreferencePage; * This singleton has bee created to manage the button ok and apply of preference page. * In the case of button ok pressed, the behavior of eclipse try of apply in the first preference page found. * Here each page has a specific behavior. So to store the preference, the active page is called + * + * @since 1.2 * */ public class VisiblePageSingleton { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java index 3b4a3791000..423e1f4d585 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java @@ -17,6 +17,8 @@ import java.util.ArrayList; /** * The Class ApplyValueOnPreferenceKeyDialog display all the preference key and give all selected keys + * + * @since 1.2 */ public abstract class AbstractApplyValueOnPreferenceKeyDialog extends AbstractPreferenceKeyDialog { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java index 14b07d5d618..178bcb1c2d8 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java @@ -31,6 +31,8 @@ import org.eclipse.swt.widgets.TableColumn; /** * The Class AbstractPreferenceKeyDialog display all preference key that are given in parameters + * + * @since 1.2 */ public abstract class AbstractPreferenceKeyDialog extends org.eclipse.jface.dialogs.StatusDialog { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java index b667228dde5..e86f8a0ef68 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java @@ -25,6 +25,8 @@ import com.google.common.collect.Iterables; /** * A content provider that synthesizes content from multiple other providers. + * + * @since 1.2 */ public class CompositePapyrusContentProvider implements IAdaptableContentProvider, IHierarchicContentProvider, IStaticContentProvider { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java index 71616365e59..b22cce3fed2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java @@ -36,16 +36,24 @@ class CompositeSemanticContentProviderFactory implements ISemanticContentProvide private CompositeSemanticContentProviderFactory(CompositeSemanticContentProviderFactory composite, ISemanticContentProviderFactory other) { super(); + this.factories = concat(composite, other); + } + + private final List<ISemanticContentProviderFactory> concat(CompositeSemanticContentProviderFactory composite, ISemanticContentProviderFactory other) { + List<ISemanticContentProviderFactory> result; + if (other instanceof CompositeSemanticContentProviderFactory) { List<ISemanticContentProviderFactory> otherFactories = ((CompositeSemanticContentProviderFactory) other).factories; - factories = new ArrayList<>(composite.factories.size() + otherFactories.size()); - factories.addAll(composite.factories); - factories.addAll(otherFactories); + result = new ArrayList<>(composite.factories.size() + otherFactories.size()); + result.addAll(composite.factories); + result.addAll(otherFactories); } else { - factories = new ArrayList<>(composite.factories.size() + 1); - factories.addAll(composite.factories); - factories.add(other); + result = new ArrayList<>(composite.factories.size() + 1); + result.addAll(composite.factories); + result.add(other); } + + return result; } @Override diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java index de1ddcce51f..cec94950fac 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java @@ -30,6 +30,8 @@ import com.google.common.collect.Lists; /** * A content-provider implementing the complete set of Papyrus-specific content-provider APIs that * delegates those APIs to another provider according to its actual capabilities. + * + * @since 1.2 */ public class DelegatingPapyrusContentProvider implements IAdaptableContentProvider, IHierarchicContentProvider, IStaticContentProvider { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java index 05eecf9f087..287279d4cec 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java @@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet; * * @see IModel * @see #compose(ISemanticContentProviderFactory) + * @since 1.2 */ @FunctionalInterface public interface ISemanticContentProviderFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java index fb55dabd681..3cc80437cd1 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java @@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; * Listens to the Lifecycle of an {@link IMultiDiagramEditor} * * @author Camille Letavernier + * @since 1.2 * */ public interface EditorLifecycleEventListener { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java index d018ab385d1..a7044bf99c4 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java @@ -19,6 +19,7 @@ import org.eclipse.papyrus.infra.core.services.IService; * It notifies its listeners when the state of the editor changes * * @author Camille Letavernier + * @since 1.2 * */ public interface EditorLifecycleManager extends IService { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java index c83e251e17c..8ad0b6cda55 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java @@ -57,6 +57,7 @@ import com.google.common.collect.Maps; * A Service to check workspace modifications on current resources * * @author Camille Letavernier + * @since 1.2 * */ public class ResourceUpdateService implements IService, IPartListener { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java index 5b84eadb2cb..26b6b124d5d 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java @@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider; * https://bugs.eclipse.org/bugs/show_bug.cgi?id=430976 * * @author Camille Letavernier + * @since 1.2 */ public class SaveLayoutBeforeClose implements IService { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java index c392791147e..a147b871441 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java @@ -43,6 +43,7 @@ import org.eclipse.ui.services.IServiceLocator; * Abstract Class to create menu from an Eclipse Command category * * @author VL222926 + * @since 1.2 * */ public abstract class AbstractCreateMenuFromCommandCategory extends ExtensionContributionFactory { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java index 27bc70bb5bc..7299f5baefa 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java @@ -21,6 +21,7 @@ import org.eclipse.papyrus.infra.ui.Activator; * Util class for display in Papyrus (label providers, etc...) * * @deprecated Use the LabelProviderService instead + * @since 1.2 */ @Deprecated public class DisplayUtils { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java index ace809b60a5..5b6c44d3a3b 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java @@ -33,6 +33,7 @@ import org.eclipse.ui.commands.ICommandService; * This class provides useful methods to manipulate Eclipse Command * * @author vl222926 + * @since 1.2 * */ public class EclipseCommandUtils { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java index 01802f176fa..4835ae0e764 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java @@ -23,6 +23,8 @@ import org.eclipse.ui.PlatformUI; /** * * a helper for the Editor + * + * @since 1.2 * */ public class EditorHelper { @@ -34,7 +36,7 @@ public class EditorHelper { /** * * @return - * the current editor or <code>null</code> if not found + * the current editor or <code>null</code> if not found */ public static final IEditorPart getCurrentEditor() { final IWorkbench workbench = PlatformUI.getWorkbench(); @@ -53,7 +55,7 @@ public class EditorHelper { /** * * @return - * the current active part or <code>null</code> if not found + * the current active part or <code>null</code> if not found */ public static final IWorkbenchPart getActivePart() { final IWorkbench workbench = PlatformUI.getWorkbench(); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java index 6918f42b92d..e476a005dd1 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java @@ -60,6 +60,7 @@ import org.eclipse.ui.PlatformUI; * * @author cedric dumoulin * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> + * @since 1.2 */ // FIXME throws Exception (eg: NotFoundException) instead of null public class EditorUtils { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java deleted file mode 100644 index 08d3f1d857b..00000000000 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2014, 2016 Christian W. Damus 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: - * Christian W. Damus - Initial API and implementation - * - *****************************************************************************/ - -package org.eclipse.papyrus.infra.ui.util; - -import java.lang.reflect.InvocationTargetException; -import java.util.concurrent.Callable; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.papyrus.infra.tools.util.IProgressCallable; - -/** - * The {@link Callable} analogue of an {@link IRunnableWithProgress}. - * - * @deprecated Use the {@link IProgressCallable} API, instead. - */ -@Deprecated -public interface ICallableWithProgress<V> extends IProgressCallable<V> { - /** - * Invokes me in a runnable context with a progress monitor. - * - * @param monitor - * the progress monitor to use to display progress and receive - * requests for cancellation - * @exception InvocationTargetException - * if the run method must propagate a checked exception, - * it should wrap it inside an <code>InvocationTargetException</code>; runtime exceptions are automatically - * wrapped in an <code>InvocationTargetException</code> by the calling context - * @exception InterruptedException - * if the operation detects a request to cancel, - * using <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing <code>InterruptedException</code> - * - * @see UIUtil#call(IRunnableContext, ICallableWithProgress) - * @see IRunnableContext#run - */ - @Override - V call(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException; -} diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java index ee0d9fb314f..f2a2e97666c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Display; * Services to access to Papyrus images * * @author tristan faure + * @since 1.2 * */ public class PapyrusImageUtils { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java index 5132a841f4c..e189d5f32a7 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java @@ -23,6 +23,7 @@ import org.eclipse.ui.PlatformUI; /** * @author VL222926 + * @since 1.2 * */ public class SelectionHelper { @@ -38,7 +39,7 @@ public class SelectionHelper { /** * * @return - * the selection service or <code>null</code> if not found + * the selection service or <code>null</code> if not found * */ public static final ISelectionService getSelectionService() { @@ -48,7 +49,7 @@ public class SelectionHelper { // ISelectionService s1 = (ISelectionService) wb.getService(ISelectionService.class); IWorkbenchWindow ww = wb.getActiveWorkbenchWindow(); if (ww != null) { - return (ISelectionService) ww.getService(ISelectionService.class); + return ww.getService(ISelectionService.class); } } return null; @@ -57,7 +58,7 @@ public class SelectionHelper { /** * * @return - * the current selection or an empty selection. can't be <code>null</code> + * the current selection or an empty selection. can't be <code>null</code> */ public static final ISelection getCurrentSelection() { ISelectionService selectionService = getSelectionService(); @@ -75,7 +76,7 @@ public class SelectionHelper { * @param viewId * the id of the view for which we want the selection * @return - * the current selection for the view, the returned value can't be <code>null</code> + * the current selection for the view, the returned value can't be <code>null</code> */ public static final ISelection getCurrentSelection(String viewId) { ISelectionService selectionService = getSelectionService(); @@ -91,7 +92,7 @@ public class SelectionHelper { /** * * @return - * a structured selection. + * a structured selection. * the returned value can't be <code>null</code> */ public static final IStructuredSelection getCurrentStructuredSelection() { @@ -107,7 +108,7 @@ public class SelectionHelper { * @param viewId * the id of the view for which we want the selection * @return - * the current selection for the view, the returned value can't be <code>null</code> + * the current selection for the view, the returned value can't be <code>null</code> */ public static final IStructuredSelection getCurrentStructuredSelection(String viewId) { ISelection selection = getCurrentSelection(viewId); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java index 917a41e8688..1ec3fd0134a 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java @@ -38,6 +38,7 @@ import org.eclipse.ui.IEditorPart; * @author cedric dumoulin * * @deprecated 0.10: Use org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers instead + * @since 1.2 */ @Deprecated public class ServiceUtilsForActionHandlers extends AbstractServiceUtils<Void> { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java index aec185cc30e..63f6cd24d44 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java @@ -35,6 +35,7 @@ import org.eclipse.ui.IWorkbenchPartSite; * @author Camille Letavernier * * @see ServiceUtilsForSelection + * @since 1.2 */ public class ServiceUtilsForHandlers extends AbstractServiceUtils<ExecutionEvent> { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java index 015a5e5076e..506ef6a36b7 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java @@ -30,6 +30,7 @@ import org.eclipse.ui.IWorkbenchPartSite; * * * @author Cedric Dumoulin + * @since 1.2 * */ public class ServiceUtilsForIEvaluationContext extends AbstractServiceUtils<IEvaluationContext> { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java index f3a799d303a..87126ccc654 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java @@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; * Expects an IStructuredSelection containing at least one EObject (It then relies on ServiceUtilsForEObject to retrieve the ServicesRegistry) * * @author Camille Letavernier + * @since 1.2 */ public class ServiceUtilsForSelection extends AbstractServiceUtils<ISelection> { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java index 624257964cc..a46413cbbf5 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java @@ -21,6 +21,7 @@ import org.eclipse.ui.IWorkbenchPage; * A ServiceUtils implementation for manipulating the Papyrus services from an IWorkbenchPage * * @author Camille Letavernier + * @since 1.2 * */ public class ServiceUtilsForWorkbenchPage extends AbstractServiceUtils<IWorkbenchPage> { @@ -40,7 +41,7 @@ public class ServiceUtilsForWorkbenchPage extends AbstractServiceUtils<IWorkbenc } if (adaptable != null) { - ServicesRegistry registry = (ServicesRegistry) adaptable.getAdapter(ServicesRegistry.class); + ServicesRegistry registry = adaptable.getAdapter(ServicesRegistry.class); if (registry != null) { return registry; } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java index 825a99386a3..1fdc3344e41 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java @@ -24,6 +24,8 @@ import org.eclipse.jface.operation.IRunnableWithProgress; /** * Helper utilities for working with transactions on the UI thread. + * + * @since 1.2 */ public class TransactionUIHelper { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java index 343bcdeba56..1c4c074654f 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java @@ -67,6 +67,8 @@ import com.google.common.collect.Iterators; /** * Miscellaneous general-purpose UI utilities. + * + * @since 1.2 */ public class UIUtil { @@ -195,33 +197,6 @@ public class UIUtil { * propagated by the context if the runnable * acknowledges cancellation by throwing this exception. This should not be thrown * if {@code cancelable} is {@code false}. - * - * @deprecated Use the {@link #call(IRunnableContext, boolean, boolean, IProgressCallable)} or - * {@link IExecutorService#submit(IProgressCallable)} API, instead. - */ - @Deprecated - public static <V> V call(IRunnableContext context, boolean fork, boolean cancelable, ICallableWithProgress<V> callable) throws InvocationTargetException, InterruptedException { - return call(context, fork, cancelable, (IProgressCallable<V>) callable); - } - - /** - * Calls a {@code callable} in the given {@code context}. - * - * @param fork - * {@code true} if the runnable should be run in a separate thread, - * and {@code false} to run in the same thread - * @param cancelable - * {@code true} to enable the cancellation, and {@code false} to make the operation uncancellable - * @param runnable - * the runnable to run - * - * @exception InvocationTargetException - * wraps any exception or error which occurs - * while running the runnable - * @exception InterruptedException - * propagated by the context if the runnable - * acknowledges cancellation by throwing this exception. This should not be thrown - * if {@code cancelable} is {@code false}. */ public static <V> V call(IRunnableContext context, boolean fork, boolean cancelable, IProgressCallable<V> callable) throws InvocationTargetException, InterruptedException { class RunnableWrapper implements IRunnableWithProgress { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java index 4ecdc94d48f..440fd597ff0 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java @@ -23,6 +23,8 @@ import org.eclipse.ui.PlatformUI; /** * * a helper for the Eclipse workbench part + * + * @since 1.2 * */ public class WorkbenchPartHelper { @@ -34,7 +36,7 @@ public class WorkbenchPartHelper { /** * * @return - * the current IWorkbenchPart or <code>null</code> if not found + * the current IWorkbenchPart or <code>null</code> if not found */ public static final IWorkbenchPart getCurrentActiveWorkbenchPart() { final IWorkbench workbench = PlatformUI.getWorkbench(); @@ -53,7 +55,7 @@ public class WorkbenchPartHelper { /** * * @return - * the current IEditorPart or <code>null</code> if not found + * the current IEditorPart or <code>null</code> if not found */ public static final IEditorPart getCurrentActiveEditorPart() { final IWorkbench workbench = PlatformUI.getWorkbench(); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project index 339688bbd54..45fd4cf5251 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF index 1aea866730d..36ccfbb2c83 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF @@ -10,13 +10,12 @@ Export-Package: org.eclipse.papyrus.infra.widgets.toolbox, org.eclipse.papyrus.infra.widgets.toolbox.notification.utils, org.eclipse.papyrus.infra.widgets.toolbox.notification.view, org.eclipse.papyrus.infra.widgets.toolbox.utils -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.ui.forms;bundle-version="3.5.100", - org.eclipse.draw2d;bundle-version="3.8.1", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0";visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java index db46f76958c..b55a94b4464 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java @@ -127,6 +127,7 @@ public class NotificationBuilder implements INotificationBuilder { * , a runnable triggered when default action of the notification is selected * The first action added is the default One * @return this + * @since 1.2 */ @SuppressWarnings("unchecked") public NotificationBuilder addAction(NotificationRunnable runnable) { @@ -223,6 +224,7 @@ public class NotificationBuilder implements INotificationBuilder { * @param type * , the desired type * @return this + * @since 1.2 */ public NotificationBuilder setType(Type type) { parameters.put(TYPE, type); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project index 6c2049aab43..d94e5b0dae1 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project @@ -20,9 +20,37 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/.api_filters b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/.api_filters new file mode 100644 index 00000000000..e9d125135df --- /dev/null +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/.api_filters @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.widgets" version="2"> + <resource path="src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java" type="org.eclipse.papyrus.infra.widgets.editors.AbstractEditor"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.editors.AbstractEditor"/> + <message_argument value="factory"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java" type="org.eclipse.papyrus.infra.widgets.editors.MultipleValueEditor"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.editors.MultipleValueEditor"/> + <message_argument value="MANY"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java" type="org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog"/> + <message_argument value="MANY"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java" type="org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider"/> + <message_argument value="instance"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java" type="org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider"/> + <message_argument value="instance"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java" type="org.eclipse.papyrus.infra.widgets.providers.TreeCollectionContentProvider"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.providers.TreeCollectionContentProvider"/> + <message_argument value="instance"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java" type="org.eclipse.papyrus.infra.widgets.providers.UnchangedObject"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.providers.UnchangedObject"/> + <message_argument value="instance"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java" type="org.eclipse.papyrus.infra.widgets.providers.UnsetObject"> + <filter comment="No sane developer would have assigned these fields" id="388100214"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.widgets.providers.UnsetObject"/> + <message_argument value="instance"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF index fd449867eca..bb486e86d50 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF @@ -1,17 +1,14 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.databinding.property;bundle-version="1.3.0", - org.eclipse.core.databinding, - org.eclipse.jface.databinding, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", - org.eclipse.core.resources;bundle-version="3.7.100", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", +Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)";visibility:=reexport, + org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)", + org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport, + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", + org.eclipse.ui.views.properties.tabbed;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, com.ibm.icu;bundle-version="4.4.2", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.jface.text;bundle-version="3.10.0", - org.eclipse.emf.edit;bundle-version="2.12.0" + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.widgets, org.eclipse.papyrus.infra.widgets.creation, org.eclipse.papyrus.infra.widgets.databinding, @@ -26,7 +23,7 @@ Export-Package: org.eclipse.papyrus.infra.widgets, org.eclipse.papyrus.infra.widgets.wizard.pages Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml index 3ee11efad95..c7067be8e76 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.widgets</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java index 22a624ecf77..db1d6132146 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java @@ -57,25 +57,28 @@ public class SelectionMenu { private Object input; private Shell shell; - + private TableViewer tableViewer; private ISelectionChangedListener selectionChangedListener; private List<ISelectionChangedListener> selectionChangedListeners; - + private KeyListener keyListener; - + private List<KeyListener> keyListeners; - + private MouseTrackListener mouseTrackListener; - + private List<MouseTrackListener> mouseTrackListeners; public SelectionMenu(Shell parentShell) { this(parentShell, parentShell.getDisplay().getCursorLocation()); } - + + /** + * @since 2.0 + */ public SelectionMenu(Shell parentShell, Object source) { if (source instanceof TableViewer && parentShell != null) { TableViewer tableViewer = (TableViewer) source; @@ -87,7 +90,7 @@ public class SelectionMenu { y += selectionIndex * cellHeight; // Get the cell's x position and append by the table's width - //int width= tableViewer.getTable().getSize().x; + // int width= tableViewer.getTable().getSize().x; int width = tableViewer.getTable().getShell().getBounds().width; int x = tableViewer.getTable().getShell().getLocation().x + width; @@ -95,16 +98,19 @@ public class SelectionMenu { init(parentShell, location, -1, 0); return; } - + init(parentShell, parentShell.getDisplay().getCursorLocation(), 1, 1); } - + + /** + * @since 2.0 + */ public SelectionMenu(Shell parentShell, Object source, Point cursorPosition) { if (source instanceof Table && parentShell != null && cursorPosition != null) { Table table = (Table) source; - + TableItem item = table.getItem(cursorPosition); - + if (item != null) { int selectionIndex = 0; for (Object tableItem : table.getItems()) { @@ -113,13 +119,13 @@ public class SelectionMenu { } selectionIndex++; } - + int cellHeight = item.getBounds().height; int y = table.getShell().getLocation().y; y += selectionIndex * cellHeight; // Get the cell's x position and append by the table's width - //int width= tableViewer.getTable().getSize().x; + // int width= tableViewer.getTable().getSize().x; int width = table.getShell().getBounds().width; int x = table.getShell().getLocation().x + width; @@ -128,14 +134,17 @@ public class SelectionMenu { return; } } - + init(parentShell, parentShell.getDisplay().getCursorLocation(), 1, 1); } public SelectionMenu(Shell parentShell, Point location) { init(parentShell, location, 1, 1); } - + + /** + * @since 2.0 + */ protected void init(Shell parentShell, Point location, int xOffset, int yOffset) { // Move the shell so that it doesn't open under the mouse // The hovered element can still be selected @@ -172,7 +181,7 @@ public class SelectionMenu { } } }; - + mouseTrackListeners = new LinkedList<MouseTrackListener>(); mouseTrackListener = new MouseTrackListener() { @Override @@ -203,10 +212,12 @@ public class SelectionMenu { shell = new Shell(parentShell, SWT.NONE); shell.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_WHITE)); shell.setBackgroundMode(SWT.INHERIT_DEFAULT); - /*GridLayout gridLayout = new GridLayout(1, false); - gridLayout.marginWidth = 5; - gridLayout.marginHeight = 5; - shell.setLayout(gridLayout);*/ + /* + * GridLayout gridLayout = new GridLayout(1, false); + * gridLayout.marginWidth = 5; + * gridLayout.marginHeight = 5; + * shell.setLayout(gridLayout); + */ shell.setLayout(new GridLayout(1, false)); // TableViewer for menu items @@ -216,7 +227,7 @@ public class SelectionMenu { tableViewer.setLabelProvider(labelProvider); ColumnViewerToolTipSupport.enableFor(tableViewer); tableViewer.setInput(input); - + // Listeners tableViewer.addSelectionChangedListener(selectionChangedListener); tableViewer.getTable().addKeyListener(keyListener); @@ -226,10 +237,13 @@ public class SelectionMenu { shell.setLocation(location); shell.pack(); shell.open(); - - + + } - + + /** + * @since 2.0 + */ public void refresh() { tableViewer.refresh(); shell.pack(); @@ -239,11 +253,11 @@ public class SelectionMenu { if (tableViewer != null) { tableViewer.removeSelectionChangedListener(selectionChangedListener); } - + if (tableViewer.getTable() != null) { tableViewer.getTable().removeKeyListener(keyListener); } - + if (shell != null) { shell.dispose(); } @@ -252,7 +266,7 @@ public class SelectionMenu { public void setContentProvider(IStructuredContentProvider provider) { this.contentProvider = provider; } - + public void setInput(Object input) { this.input = input; } @@ -261,30 +275,51 @@ public class SelectionMenu { this.labelProvider = labelProvider; } + /** + * @since 1.2 + */ public void addSelectionChangedListener(ISelectionChangedListener listener) { this.selectionChangedListeners.add(listener); } - + + /** + * @since 2.0 + */ public void addKeyListener(KeyListener listener) { this.keyListeners.add(listener); } - + + /** + * @since 2.0 + */ public void addMouseTrackListener(MouseTrackListener listener) { this.mouseTrackListeners.add(listener); } - + + /** + * @since 2.0 + */ public Shell getShell() { return shell; } + /** + * @since 2.0 + */ public void setShell(Shell shell) { this.shell = shell; } - + + /** + * @since 2.0 + */ public Shell getParentShell() { return parentShell; } - + + /** + * @since 2.0 + */ public TableViewer getTableViewer() { return tableViewer; } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java index 91bd6ae32ce..a56a0a0d418 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java @@ -97,6 +97,9 @@ public class CompositeContentProvider implements ICompositeContentProvider { contentProviders.add(treeContentProvider); } + /** + * @since 2.0 + */ public List<ITreeContentProvider> getContentProviders() { return contentProviders; } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java index cadecebe16f..6272fd11b9f 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java @@ -47,7 +47,7 @@ public interface INameResolutionHelper { * The element to get the shortest qualified name. * @return * the shortest qualified to use for the element - * @deprecated since 1.2.0 + * @deprecated since 2.0 */ @Deprecated public List<String> getShortestQualifiedNames(final Object element); @@ -60,6 +60,8 @@ public interface INameResolutionHelper { * @param manageDuplicate * Boolean to determinate if the duplicated shortest qualified names must be remove from the returned list. * @return the shortest qualified to use for the element + * + * @since 2.0 */ public List<String> getShortestQualifiedNames(final Object element, final boolean manageDuplicate); diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.project index 0e3aaf843fb..4941836579d 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.project +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.configuration.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.configuration.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF index d00b3193c98..d5f7ff020b8 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF @@ -1,21 +1,19 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.edit,
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="1.2.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.provider.ConfigurationEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.provider +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.provider.ConfigurationEditPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.project index bcf711a4642..0b73751b851 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.project +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.configuration.editor</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.configuration.editor</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF index 99b0aa9569b..9c351a4cecc 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF @@ -1,22 +1,18 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.ui.ide,
- org.eclipse.emf.ecore.edit,
- org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.presentation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationEditorPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.configuration.edit;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.presentation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationEditorPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.project index 28e4c8d56a1..03566d32a56 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.project +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.configuration</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.configuration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF index 5b044c8d5de..d52de836b7b 100644 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF @@ -1,27 +1,25 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration,
- org.eclipse.papyrus.infra.viewpoints.configuration.impl,
- org.eclipse.papyrus.infra.viewpoints.configuration.ui,
- org.eclipse.papyrus.infra.viewpoints.configuration.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jface,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.Activator$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration, + org.eclipse.papyrus.infra.viewpoints.configuration.impl, + org.eclipse.papyrus.infra.viewpoints.configuration.ui, + org.eclipse.papyrus.infra.viewpoints.configuration.util +Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.Activator$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.project index 3a171fbc9e7..64e8cf43b40 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.project +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF index 837f149d818..baae4db5955 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.viewpoints.iso42010.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.provider.Iso42010EditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.iso42010.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.infra.viewpoints.iso42010.provider +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.provider.Iso42010EditPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.iso42010.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.project index d7721c0768d..fe8726d9697 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.project +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.iso42010</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.iso42010</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF index 9ac1d99d2f8..2abe9df59ea 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.viewpoints.iso42010,
- org.eclipse.papyrus.infra.viewpoints.iso42010.impl,
- org.eclipse.papyrus.infra.viewpoints.iso42010.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.iso42010;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.viewpoints.iso42010, + org.eclipse.papyrus.infra.viewpoints.iso42010.impl, + org.eclipse.papyrus.infra.viewpoints.iso42010.util +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.iso42010;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.project index e895d4f56f5..43b1e3b6b27 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.project +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.policy</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.policy</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF index 44cd99b71a7..91d463d9a96 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF @@ -1,34 +1,28 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.viewpoints.policy,
- org.eclipse.papyrus.infra.viewpoints.policy.listener,
- org.eclipse.papyrus.infra.viewpoints.policy.query,
- org.eclipse.papyrus.infra.viewpoints.style,
- org.eclipse.papyrus.infra.viewpoints.style.impl,
- org.eclipse.papyrus.infra.viewpoints.style.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.expressions,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.gmf.runtime.notation;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.policy.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.infra.viewpoints.policy, + org.eclipse.papyrus.infra.viewpoints.policy.listener, + org.eclipse.papyrus.infra.viewpoints.policy.query, + org.eclipse.papyrus.infra.viewpoints.style, + org.eclipse.papyrus.infra.viewpoints.style.impl, + org.eclipse.papyrus.infra.viewpoints.style.util +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.policy.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.project index 9c98c99a4f0..d7c7b04faf4 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.project +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.viewpoints.preferences</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.infra.viewpoints.preferences</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF index 2e46a2f8f24..54a3a3ce0d5 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF @@ -1,19 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.9.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.preferences.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.preferences;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.preferences.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.preferences;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project index 0175da62ef3..9d243ef8973 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF index 6e50c15d0ca..7da108ff59d 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF @@ -1,17 +1,16 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider, org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider, org.eclipse.papyrus.infra.extendedtypes.provider Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin$Implementation diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml index 23558b55db6..4354ed19721 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.extendedtypes.edit</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project index a389db7f315..d504a4a6386 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project index f485136d322..97bb4793cf3 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF index 3e47b54c845..f37c80df14f 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF @@ -1,16 +1,10 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.emf.ecore;bundle-version="2.7.0", - org.eclipse.emf.ecore.xmi;bundle-version="2.6.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.emf.edit, - org.eclipse.emf.ecore.edit, - org.eclipse.uml2.uml.edit, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf, org.eclipse.papyrus.infra.extendedtypes.emf.converter, org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration, @@ -22,7 +16,7 @@ Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.emf.Activator diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml index 1c6334dd6c2..94285dc4a89 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.extendedtypes.emf</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java index c7e2650e595..d935cbc42f9 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java @@ -35,6 +35,7 @@ public interface ViewToDisplay extends EObject { * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getViewToDisplay_View() * @model required="true" * @generated + * @since 2.0 */ View getView(); @@ -47,6 +48,7 @@ public interface ViewToDisplay extends EObject { * the new value of the '<em>View</em>' reference. * @see #getView() * @generated + * @since 2.0 */ void setView(View value); diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java index b2c172b7087..f3df9e53dba 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java @@ -62,6 +62,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V * <!-- end-user-doc --> * * @generated + * @since 2.0 */ @Override public View getView() { @@ -82,6 +83,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V * <!-- end-user-doc --> * * @generated + * @since 2.0 */ public View basicGetView() { return view; @@ -92,6 +94,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V * <!-- end-user-doc --> * * @generated + * @since 2.0 */ @Override public void setView(View newView) { diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project index 387caa58b2d..6a293ed41dc 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF index f39408954dd..fbcbe38f166 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF @@ -1,12 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.infra.extendedtypes.internal.ui;x-internal:=true, org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;x-internal:=true, org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;x-internal:=true, diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project index 6276e028691..211d9c88923 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project @@ -20,9 +20,33 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF index b575b2d7e5f..7636f15c90b 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF @@ -1,10 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.infra.extendedtypes, org.eclipse.papyrus.infra.extendedtypes.advices, org.eclipse.papyrus.infra.extendedtypes.impl, @@ -21,7 +17,7 @@ Export-Package: org.eclipse.papyrus.infra.extendedtypes, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.Activator diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml index 9a55cb5df33..8188b14cb85 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.extendedtypes</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> +</project>
\ No newline at end of file diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java index 8ae43cff4e3..87978b1f448 100644 --- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java +++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java @@ -28,6 +28,8 @@ import org.osgi.framework.Bundle; /** * Utilities for internal use by rthe ExtendedTypes bundle. + * + * @noreference This class is not intended to be referenced by clients. */ public class InternalUtils { diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.project index ea774f98b87..3e0c8596440 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.project +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.diagram.blockdefinition</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.diagram.blockdefinition</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF index e24f1e25465..964281d841f 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF @@ -1,62 +1,29 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.command,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.factory,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.messages,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.part,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.provider,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.ui,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.emf.common.ui;bundle-version="2.5.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
- org.eclipse.core.expressions;bundle-version="3.4.100",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
- org.eclipse.draw2d;bundle-version="3.7.1",
- org.eclipse.gef;bundle-version="3.7.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.blockdefinition;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition, + org.eclipse.papyrus.sysml.diagram.blockdefinition.command, + org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper, + org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part, + org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy, + org.eclipse.papyrus.sysml.diagram.blockdefinition.factory, + org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice, + org.eclipse.papyrus.sysml.diagram.blockdefinition.messages, + org.eclipse.papyrus.sysml.diagram.blockdefinition.part, + org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences, + org.eclipse.papyrus.sysml.diagram.blockdefinition.provider, + org.eclipse.papyrus.sysml.diagram.blockdefinition.ui, + org.eclipse.papyrus.sysml.diagram.blockdefinition.utils +Require-Bundle: org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.blockdefinition;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.project index eac33086b37..4b32599bc05 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.project +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF index aed74783000..6f983d39757 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF @@ -1,79 +1,46 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,
- org.eclipse.papyrus.gmf.diagram.common.compatibility,
- org.eclipse.papyrus.gmf.diagram.common.edit.part,
- org.eclipse.papyrus.gmf.diagram.common.edit.policy,
- org.eclipse.papyrus.gmf.diagram.common.factory,
- org.eclipse.papyrus.gmf.diagram.common.locator,
- org.eclipse.papyrus.gmf.diagram.common.parser,
- org.eclipse.papyrus.gmf.diagram.common.provider,
- org.eclipse.papyrus.sysml.diagram.common,
- org.eclipse.papyrus.sysml.diagram.common.commands,
- org.eclipse.papyrus.sysml.diagram.common.dialogs,
- org.eclipse.papyrus.sysml.diagram.common.edit.part,
- org.eclipse.papyrus.sysml.diagram.common.edit.policy,
- org.eclipse.papyrus.sysml.diagram.common.factory,
- org.eclipse.papyrus.sysml.diagram.common.figure,
- org.eclipse.papyrus.sysml.diagram.common.messages,
- org.eclipse.papyrus.sysml.diagram.common.parser,
- org.eclipse.papyrus.sysml.diagram.common.preferences,
- org.eclipse.papyrus.sysml.diagram.common.strategy.paste,
- org.eclipse.papyrus.sysml.diagram.common.utils,
- org.eclipse.papyrus.uml.diagram.common.dnd.helper,
- org.eclipse.papyrus.uml.diagram.common.edit.part,
- org.eclipse.papyrus.uml.diagram.common.edit.policy,
- org.eclipse.papyrus.uml.diagram.common.factory,
- org.eclipse.papyrus.uml.diagram.common.figure,
- org.eclipse.papyrus.uml.diagram.common.parser,
- org.eclipse.papyrus.uml.diagram.common.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.sysml;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.2.0",
- org.eclipse.draw2d;bundle-version="3.7.1",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.common.edit;bundle-version="1.6.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands, + org.eclipse.papyrus.gmf.diagram.common.compatibility, + org.eclipse.papyrus.gmf.diagram.common.edit.part, + org.eclipse.papyrus.gmf.diagram.common.edit.policy, + org.eclipse.papyrus.gmf.diagram.common.factory, + org.eclipse.papyrus.gmf.diagram.common.locator, + org.eclipse.papyrus.gmf.diagram.common.parser, + org.eclipse.papyrus.gmf.diagram.common.provider, + org.eclipse.papyrus.sysml.diagram.common, + org.eclipse.papyrus.sysml.diagram.common.commands, + org.eclipse.papyrus.sysml.diagram.common.dialogs, + org.eclipse.papyrus.sysml.diagram.common.edit.part, + org.eclipse.papyrus.sysml.diagram.common.edit.policy, + org.eclipse.papyrus.sysml.diagram.common.factory, + org.eclipse.papyrus.sysml.diagram.common.figure, + org.eclipse.papyrus.sysml.diagram.common.messages, + org.eclipse.papyrus.sysml.diagram.common.parser, + org.eclipse.papyrus.sysml.diagram.common.preferences, + org.eclipse.papyrus.sysml.diagram.common.strategy.paste, + org.eclipse.papyrus.sysml.diagram.common.utils, + org.eclipse.papyrus.uml.diagram.common.dnd.helper, + org.eclipse.papyrus.uml.diagram.common.edit.part, + org.eclipse.papyrus.uml.diagram.common.edit.policy, + org.eclipse.papyrus.uml.diagram.common.factory, + org.eclipse.papyrus.uml.diagram.common.figure, + org.eclipse.papyrus.uml.diagram.common.parser, + org.eclipse.papyrus.uml.diagram.common.utils +Require-Bundle: org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.composite;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project index 6ef523271d2..5221c6d2f7b 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.diagram.css</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</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.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.diagram.css</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF index f24df6ae445..f4d8f54aa0f 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="1.2.0";resolution:=optional
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: SysML Css
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.css;singleton:=true
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="[1.2.0,2.0.0)";resolution:=optional +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: SysML Css +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.css;singleton:=true diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.project index 19f4da0ec4d..ad621f25855 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.project +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.diagram.internalblock</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.diagram.internalblock</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF index 15f243eed30..5e78cf1806c 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF @@ -1,60 +1,29 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,
- org.eclipse.papyrus.sysml.diagram.internalblock.compatibility,
- org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper,
- org.eclipse.papyrus.sysml.diagram.internalblock.edit.part,
- org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy,
- org.eclipse.papyrus.sysml.diagram.internalblock.factory,
- org.eclipse.papyrus.sysml.diagram.internalblock.handler,
- org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice,
- org.eclipse.papyrus.sysml.diagram.internalblock.messages,
- org.eclipse.papyrus.sysml.diagram.internalblock.part,
- org.eclipse.papyrus.sysml.diagram.internalblock.preferences,
- org.eclipse.papyrus.sysml.diagram.internalblock.provider,
- org.eclipse.papyrus.sysml.diagram.internalblock.ui,
- org.eclipse.papyrus.sysml.diagram.internalblock.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.emf.common.ui;bundle-version="2.5.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.internalblock.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.internalblock;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock, + org.eclipse.papyrus.sysml.diagram.internalblock.compatibility, + org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper, + org.eclipse.papyrus.sysml.diagram.internalblock.edit.part, + org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy, + org.eclipse.papyrus.sysml.diagram.internalblock.factory, + org.eclipse.papyrus.sysml.diagram.internalblock.handler, + org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice, + org.eclipse.papyrus.sysml.diagram.internalblock.messages, + org.eclipse.papyrus.sysml.diagram.internalblock.part, + org.eclipse.papyrus.sysml.diagram.internalblock.preferences, + org.eclipse.papyrus.sysml.diagram.internalblock.provider, + org.eclipse.papyrus.sysml.diagram.internalblock.ui, + org.eclipse.papyrus.sysml.diagram.internalblock.utils +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.sysml.diagram.internalblock.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.internalblock;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.project index 00bd1cbfb8f..c9b1194566a 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.project +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF index d007e0670dd..03da53dd9bf 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF @@ -15,46 +15,14 @@ Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.sysml;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.emf.common.ui;bundle-version="2.5.0", - org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.core.expressions, - org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.0.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.core.databinding.observable;bundle-version="1.4.1", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-Version: 1.2.0.qualifier Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.parametric.Activator -Import-Package: org.eclipse.gmf.runtime.notation Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.parametric;singleton:=true diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.project index b4fccf80b99..a69191c342f 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.project +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.diagram.requirement</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.diagram.requirement</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF index 8e0c351d2e9..a438aaa28f5 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF @@ -1,45 +1,25 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.requirement,
- org.eclipse.papyrus.sysml.diagram.requirement.edit.part,
- org.eclipse.papyrus.sysml.diagram.requirement.edit.policy,
- org.eclipse.papyrus.sysml.diagram.requirement.factory,
- org.eclipse.papyrus.sysml.diagram.requirement.figure,
- org.eclipse.papyrus.sysml.diagram.requirement.part,
- org.eclipse.papyrus.sysml.diagram.requirement.preferences,
- org.eclipse.papyrus.sysml.diagram.requirement.provider,
- org.eclipse.papyrus.sysml.diagram.requirement.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.3.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.emf.common.ui;bundle-version="2.7.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.requirement;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.sysml.diagram.requirement, + org.eclipse.papyrus.sysml.diagram.requirement.edit.part, + org.eclipse.papyrus.sysml.diagram.requirement.edit.policy, + org.eclipse.papyrus.sysml.diagram.requirement.factory, + org.eclipse.papyrus.sysml.diagram.requirement.figure, + org.eclipse.papyrus.sysml.diagram.requirement.part, + org.eclipse.papyrus.sysml.diagram.requirement.preferences, + org.eclipse.papyrus.sysml.diagram.requirement.provider, + org.eclipse.papyrus.sysml.diagram.requirement.utils +Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.requirement;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.project index e51b94394b9..a418f657d48 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.project +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.diagram.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.diagram.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF index 157a725ce9f..bff7f89ddd9 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF @@ -1,19 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.ui
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.jface;bundle-version="3.8.0",
- org.eclipse.ui,
- org.eclipse.ui.ide;bundle-version="3.8.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.ui.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.sysml.diagram.ui +Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.sysml.diagram.ui.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.project b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.project index 00c00f2882b..5bba3dabd12 100644 --- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.project +++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.project @@ -20,10 +20,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF index 2ee31539b1c..564930a2f93 100644 --- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF @@ -1,32 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.uml2.uml, - org.eclipse.papyrus.sysml;bundle-version="1.2.0", - org.eclipse.swt, - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0", - org.eclipse.ui.navigator;bundle-version="3.5.0", - org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", - org.eclipse.emf.edit.ui, - org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.modelexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.newchild;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.sysml.modelexplorer Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.project index 2952f2f0fd5..8a9b82152d2 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.project +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable.allocation.config</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable.allocation.config</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF index 184f2dd252e..bb76d3cf41d 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF @@ -1,20 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.sysml;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0", - org.eclipse.papyrus.sysml.nattable.menu;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", - org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.2.0", - org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.core.expressions, - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.nattable.menu;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.nattable.menu;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.project index 090ef2018bf..4e3ef804d67 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.project +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable.allocation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable.allocation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF index 1909c9d6db7..4716e91a904 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF @@ -1,14 +1,11 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.project index 5bfcdd44c46..e365453e1f7 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.project +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable.menu</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable.menu</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF index 32e9f396913..e1f07dcb5b6 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF @@ -1,26 +1,9 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.sysml.nattable.menu.handlers -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.500", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.nattable.menu;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.project index 69098c4874f..ffc5f601ace 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.project +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable.requirement.config</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable.requirement.config</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF index cb805ad3002..98cae79f5f6 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF @@ -1,22 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0"
-Export-Package: org.eclipse.papyrus.sysml.nattable.requirement.config
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.config.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.config;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.sysml.nattable;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.sysml.nattable.requirement.config +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.config.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.config;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.project index aa9be074768..9e407fbf5b5 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.project +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable.requirement</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable.requirement</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF index aaf15b0c5ef..f789c7b1675 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF @@ -1,19 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0, - 2.0.0)", - org.eclipse.papyrus.uml.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.sysml;bundle-version="1.2.0", - org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.nattable;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.project index 0f56d109391..4b62d7d5443 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.project +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.nattable</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.nattable</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF index d6938bba168..cf5c2b67eaa 100644 --- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF +++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF @@ -1,25 +1,8 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.sysml.nattable.manager.axis -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0", - org.eclipse.emf.edit;bundle-version="2.9.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.sysml;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.project b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.project index f481b46ece4..bdc3f8b5dce 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.project +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF index 02f38e786e5..2e0caf3fe0b 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF @@ -1,37 +1,31 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.emf.edit;bundle-version="2.8.0",
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,
- 2.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[2.0.0,
- 3.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.0.0,
- 6.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.edit;bundle-version="[5.0.0,
- 6.0.0)",
- org.eclipse.uml2.common.edit;bundle-version="[2.0.0,
- 3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.papyrus.sysml.activities.provider,
- org.eclipse.papyrus.sysml.allocations.provider,
- org.eclipse.papyrus.sysml.blocks.provider,
- org.eclipse.papyrus.sysml.constraints.provider,
- org.eclipse.papyrus.sysml.edit.provider,
- org.eclipse.papyrus.sysml.edit.umllayer,
- org.eclipse.papyrus.sysml.modelelements.provider,
- org.eclipse.papyrus.sysml.portandflows.provider,
- org.eclipse.papyrus.sysml.provider,
- org.eclipse.papyrus.sysml.registry,
- org.eclipse.papyrus.sysml.requirements.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.provider.SysmlEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)", + org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.sysml.activities.provider, + org.eclipse.papyrus.sysml.allocations.provider, + org.eclipse.papyrus.sysml.blocks.provider, + org.eclipse.papyrus.sysml.constraints.provider, + org.eclipse.papyrus.sysml.edit.provider, + org.eclipse.papyrus.sysml.edit.umllayer, + org.eclipse.papyrus.sysml.modelelements.provider, + org.eclipse.papyrus.sysml.portandflows.provider, + org.eclipse.papyrus.sysml.provider, + org.eclipse.papyrus.sysml.registry, + org.eclipse.papyrus.sysml.requirements.provider +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.sysml.provider.SysmlEditPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.project b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.project index 1f051b2f80f..821d3e0ce6d 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.project +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF index d4ddce72c7f..174c1bc35db 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF @@ -7,23 +7,9 @@ Export-Package: org.eclipse.papyrus.sysml.service.types, org.eclipse.papyrus.sysml.service.types.matcher, org.eclipse.papyrus.sysml.service.types.menu, org.eclipse.papyrus.sysml.service.types.utils -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.uml2.uml;bundle-version="5.0.0", - org.eclipse.papyrus.sysml;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.core.expressions, - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0", - org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/.project b/plugins/sysml/org.eclipse.papyrus.sysml/.project index 7ab23bdcd38..4da3facade5 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml/.project +++ b/plugins/sysml/org.eclipse.papyrus.sysml/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF index b5dd1277a62..bdab799af10 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF +++ b/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF @@ -1,53 +1,46 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,
- 2.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[2.0.0,
- 3.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.0.0,
- 6.0.0)"
-Export-Package: org.eclipse.papyrus.sysml,
- org.eclipse.papyrus.sysml.activities,
- org.eclipse.papyrus.sysml.activities.internal.impl,
- org.eclipse.papyrus.sysml.activities.util,
- org.eclipse.papyrus.sysml.allocations,
- org.eclipse.papyrus.sysml.allocations.internal.impl,
- org.eclipse.papyrus.sysml.allocations.util,
- org.eclipse.papyrus.sysml.blocks,
- org.eclipse.papyrus.sysml.blocks.internal.impl,
- org.eclipse.papyrus.sysml.blocks.util,
- org.eclipse.papyrus.sysml.constraints,
- org.eclipse.papyrus.sysml.constraints.internal.impl,
- org.eclipse.papyrus.sysml.constraints.util,
- org.eclipse.papyrus.sysml.interactions,
- org.eclipse.papyrus.sysml.interactions.internal.impl,
- org.eclipse.papyrus.sysml.interactions.util,
- org.eclipse.papyrus.sysml.internal.impl,
- org.eclipse.papyrus.sysml.modelelements,
- org.eclipse.papyrus.sysml.modelelements.internal.impl,
- org.eclipse.papyrus.sysml.modelelements.util,
- org.eclipse.papyrus.sysml.portandflows,
- org.eclipse.papyrus.sysml.portandflows.internal.impl,
- org.eclipse.papyrus.sysml.portandflows.util,
- org.eclipse.papyrus.sysml.requirements,
- org.eclipse.papyrus.sysml.requirements.internal.impl,
- org.eclipse.papyrus.sysml.requirements.util,
- org.eclipse.papyrus.sysml.statemachines,
- org.eclipse.papyrus.sysml.statemachines.internal.impl,
- org.eclipse.papyrus.sysml.statemachines.util,
- org.eclipse.papyrus.sysml.usecases,
- org.eclipse.papyrus.sysml.usecases.internal.impl,
- org.eclipse.papyrus.sysml.usecases.util,
- org.eclipse.papyrus.sysml.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.sysml, + org.eclipse.papyrus.sysml.activities, + org.eclipse.papyrus.sysml.activities.internal.impl, + org.eclipse.papyrus.sysml.activities.util, + org.eclipse.papyrus.sysml.allocations, + org.eclipse.papyrus.sysml.allocations.internal.impl, + org.eclipse.papyrus.sysml.allocations.util, + org.eclipse.papyrus.sysml.blocks, + org.eclipse.papyrus.sysml.blocks.internal.impl, + org.eclipse.papyrus.sysml.blocks.util, + org.eclipse.papyrus.sysml.constraints, + org.eclipse.papyrus.sysml.constraints.internal.impl, + org.eclipse.papyrus.sysml.constraints.util, + org.eclipse.papyrus.sysml.interactions, + org.eclipse.papyrus.sysml.interactions.internal.impl, + org.eclipse.papyrus.sysml.interactions.util, + org.eclipse.papyrus.sysml.internal.impl, + org.eclipse.papyrus.sysml.modelelements, + org.eclipse.papyrus.sysml.modelelements.internal.impl, + org.eclipse.papyrus.sysml.modelelements.util, + org.eclipse.papyrus.sysml.portandflows, + org.eclipse.papyrus.sysml.portandflows.internal.impl, + org.eclipse.papyrus.sysml.portandflows.util, + org.eclipse.papyrus.sysml.requirements, + org.eclipse.papyrus.sysml.requirements.internal.impl, + org.eclipse.papyrus.sysml.requirements.util, + org.eclipse.papyrus.sysml.statemachines, + org.eclipse.papyrus.sysml.statemachines.internal.impl, + org.eclipse.papyrus.sysml.statemachines.util, + org.eclipse.papyrus.sysml.usecases, + org.eclipse.papyrus.sysml.usecases.internal.impl, + org.eclipse.papyrus.sysml.usecases.util, + org.eclipse.papyrus.sysml.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.sysml;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.project b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.project index 1601b293212..0c810aefd46 100644 --- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.project +++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.properties</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.sysml.properties</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF index c47232c09b9..6df27acb532 100644 --- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF +++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF @@ -1,8 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.properties;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project index c748680444f..2948882beb8 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.alf.common.ui</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.alf.common.ui</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF index 5299804af5d..875f5172d0e 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF @@ -1,19 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.antlr.runtime
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common.ui;singleton:=true
-Import-Package: org.apache.log4j
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist +Bundle-ActivationPolicy: lazy +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common.ui;singleton:=true +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project index 697d1ad948d..22e3dc641f6 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.alf.common</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.alf.common</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF index 6dfa4edb7d2..eb0e4c2e8b1 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF @@ -1,25 +1,23 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.alf,
- org.eclipse.papyrus.uml.alf.naming,
- org.eclipse.papyrus.uml.alf.serializer,
- org.eclipse.papyrus.uml.alf.services,
- org.eclipse.papyrus.uml.alf.validation
-Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util,
- org.antlr.runtime,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.alf, + org.eclipse.papyrus.uml.alf.naming, + org.eclipse.papyrus.uml.alf.serializer, + org.eclipse.papyrus.uml.alf.services, + org.eclipse.papyrus.uml.alf.validation +Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport, + org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project index 52736e1e73e..dd033dde7e9 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.alf.libraries</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.alf.libraries</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF index 7eeb5ff6ad4..33d2a47a9a1 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF @@ -1,18 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.10.1",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.alf.libraries,
- org.eclipse.papyrus.uml.alf.libraries.helper
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: ALF Libraries
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.alf.libraries.AlfLibrariesActivator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.libraries;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.alf.libraries, + org.eclipse.papyrus.uml.alf.libraries.helper +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: ALF Libraries +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.alf.libraries.AlfLibrariesActivator +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.libraries;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project index be4e453d1bf..c660e607f52 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.alf.to.fuml</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.alf.to.fuml</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF index cb8fda10986..3491d9bb044 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF @@ -1,13 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.xtext;bundle-version="2.8.0",
- org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",
- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Alf to fUML transformation
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.alf.to.fuml.AlfMappingActivator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.to.fuml;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.uml.alf;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Alf to fUML transformation +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.alf.to.fuml.AlfMappingActivator +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.to.fuml;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project index 96e2d25ba65..9d73c311992 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF index 56b5d0ed7af..51aad214b3d 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF @@ -1,47 +1,34 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext.ui,
- org.eclipse.xtext.ui.shared,
- org.eclipse.xtext.builder,
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.compare,
- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",
- org.apache.log4j,
- org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gef,
- org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.ui.editors,
- org.eclipse.ui,
- org.antlr.runtime,
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.common.ui;bundle-version="1.8.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",
- org.eclipse.xtext.xbase.lib,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.ocl.ecore;bundle-version="3.3.100",
- org.eclipse.xtext,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.libraries;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist,
- org.eclipse.papyrus.uml.alf.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.alf.ui.editor,
- org.eclipse.papyrus.uml.alf.ui.internal,
- org.eclipse.papyrus.uml.alf.ui.quickfix
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: ALF Language (UI)
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.AlfActivator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.ui;singleton:=true
-Import-Package: org.apache.log4j,
- org.eclipse.emf.common.util,
- org.eclipse.papyrus.uml.extensionpoints.profile,
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.common.types.ui;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.10.0,3.0.0)", + org.eclipse.compare;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.uml.alf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.libraries;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist, + org.eclipse.papyrus.uml.alf.ui.contentassist.antlr, + org.eclipse.papyrus.uml.alf.ui.editor, + org.eclipse.papyrus.uml.alf.ui.internal, + org.eclipse.papyrus.uml.alf.ui.quickfix +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: ALF Language (UI) +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.AlfActivator +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.ui;singleton:=true +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project index 908b342c5b5..b942294301f 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF index a82e8aca229..2cbb855c044 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF @@ -1,59 +1,47 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.alf,
- org.eclipse.papyrus.uml.alf.formatting,
- org.eclipse.papyrus.uml.alf.generator,
- org.eclipse.papyrus.uml.alf.impl,
- org.eclipse.papyrus.uml.alf.parser.antlr,
- org.eclipse.papyrus.uml.alf.parser.antlr.internal,
- org.eclipse.papyrus.uml.alf.scoping,
- org.eclipse.papyrus.uml.alf.serializer,
- org.eclipse.papyrus.uml.alf.services,
- org.eclipse.papyrus.uml.alf.util,
- org.eclipse.papyrus.uml.alf.validation
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.xtext.common.types,
- org.eclipse.emf.codegen.ecore.ui;bundle-version="2.9.0",
- org.eclipse.emf.codegen.ui;bundle-version="2.6.0",
- org.eclipse.ocl.common;bundle-version="1.1.0",
- org.eclipse.ocl.common.ui;bundle-version="1.1.0",
- org.eclipse.ocl.ecore;bundle-version="3.3.0",
- org.eclipse.uml2.uml.resources,
- org.objectweb.asm;bundle-version="[5.0.1,
- 6.0.0)";resolution:=optional,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.gmf.runtime.common.ui.services,
- org.eclipse.papyrus.uml.alf.libraries;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.alf.AlfActivator
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.alf, + org.eclipse.papyrus.uml.alf.formatting, + org.eclipse.papyrus.uml.alf.generator, + org.eclipse.papyrus.uml.alf.impl, + org.eclipse.papyrus.uml.alf.parser.antlr, + org.eclipse.papyrus.uml.alf.parser.antlr.internal, + org.eclipse.papyrus.uml.alf.scoping, + org.eclipse.papyrus.uml.alf.serializer, + org.eclipse.papyrus.uml.alf.services, + org.eclipse.papyrus.uml.alf.util, + org.eclipse.papyrus.uml.alf.validation +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport, + org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.xtext.common.types;bundle-version="[2.10.0,3.0.0)", + org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.12.0,3.0.0)", + org.eclipse.emf.codegen.ui;bundle-version="[2.6.0,3.0.0)", + org.eclipse.ocl.common.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml.resources;bundle-version="[5.2.0,6.0.0)", + org.objectweb.asm;bundle-version="[5.0.0,6.0.0)";resolution:=optional, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.9.0,2.0.0)", + org.eclipse.papyrus.uml.alf.libraries;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Activator: org.eclipse.papyrus.uml.alf.AlfActivator +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf;singleton:=true diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project index e2552a449d5..6827d32a0eb 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project @@ -20,10 +20,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF index dc0cb12bca6..3d4a1ae9b09 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF @@ -1,25 +1,11 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;bundle-version="2.11.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.xtext.xbase.lib;bundle-version="2.8.0", - org.eclipse.xtend.lib;bundle-version="2.8.0", - org.eclipse.xtend.lib.macro;bundle-version="2.8.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", - com.google.inject;bundle-version="3.0.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0", - org.eclipse.ui;bundle-version="3.107.0", - org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.10.100", - org.eclipse.papyrus.uml.profile.types.generator.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + com.google.inject;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.profile.types.generator.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project index 12b59618d12..5f0bb01b225 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project @@ -25,11 +25,29 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF index ef6af45fc25..bd864312bbc 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF @@ -1,18 +1,11 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;bundle-version="2.11.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.xtend.lib;bundle-version="2.8.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", - com.google.inject;bundle-version="3.0.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", - org.eclipse.papyrus.uml.filters;bundle-version="1.2.0" +Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + com.google.inject;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.uml.filters;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator, org.eclipse.papyrus.uml.profile.assistants.generator.internal;x-internal:=true Bundle-Vendor: %providerName diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project index 4e3786687a1..40df7cdc1cc 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project @@ -20,10 +20,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF index cbb2d4def1b..f5e494e8142 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF @@ -1,35 +1,20 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib.macro;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.profile.types.generator.ui.internal,
- org.eclipse.papyrus.uml.profile.types.generator.ui.internal.handlers,
- org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;x-friends:="org.eclipse.papyrus.uml.profile.assistants.generator.ui"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + com.google.inject;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.profile.types.generator.ui.internal, + org.eclipse.papyrus.uml.profile.types.generator.ui.internal.handlers, + org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;x-friends:="org.eclipse.papyrus.uml.profile.assistants.generator.ui" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project index 9890647cdf6..e037d9c53c6 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project @@ -25,11 +25,29 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF index 3b18f830ec2..088efcf1700 100644 --- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF +++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF @@ -1,24 +1,18 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.profile.types.generator,
- org.eclipse.papyrus.uml.profile.types.generator.internal;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.internal.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + com.google.inject;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.types.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.uml.profile.types.generator, + org.eclipse.papyrus.uml.profile.types.generator.internal;x-internal:=true +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.internal.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project index 3e210335afd..dfb7cb38d4e 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF index 719c12e4ab6..fc1f757a41e 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF @@ -1,35 +1,24 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.common;visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
- org.eclipse.papyrus.uml.decoratormodel;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.commands;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.messages;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.updaters;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.decoratormodel;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.commands;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.messages;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.updaters;x-internal:=true +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project index ff3c7c0fd61..b1b4c908fc9 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF index 9d6e1e283ea..79dd160e3fc 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF @@ -1,27 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.uml.properties;bundle-version="1.2.0", - org.eclipse.core.databinding.observable;bundle-version="1.4.1", - org.eclipse.core.databinding;bundle-version="1.4.1", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.emf.edit;bundle-version="2.10.0", - org.eclipse.emf.transaction;bundle-version="1.8.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.emf.databinding;bundle-version="1.3.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.decoratormodel;bundle-version="1.2.0", - org.eclipse.papyrus.uml.decoratormodel.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.decoratormodel.ui;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.properties.constraints;x-internal:=true, org.eclipse.papyrus.uml.decoratormodel.properties, org.eclipse.papyrus.uml.decoratormodel.properties.elements, diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project index 10b0b694c9b..befe24320cb 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF index ef8389443d5..4dfae902cc3 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF @@ -1,44 +1,27 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
- org.eclipse.papyrus.uml.decoratormodel;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.10.0",
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.ui.navigator;bundle-version="3.5.500",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0";resolution:=optional,
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.ui,
- org.eclipse.papyrus.uml.decoratormodel.internal.ui.commands;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",
- org.eclipse.papyrus.uml.decoratormodel.internal.ui.expressions;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.ui.preferences;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.ui.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",
- org.eclipse.papyrus.uml.decoratormodel.internal.ui.wizards;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",
- org.eclipse.papyrus.uml.decoratormodel.ui.providers
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.ui.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.decoratormodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", + org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.ui, + org.eclipse.papyrus.uml.decoratormodel.internal.ui.commands;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties", + org.eclipse.papyrus.uml.decoratormodel.internal.ui.expressions;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.ui.preferences;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.ui.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties", + org.eclipse.papyrus.uml.decoratormodel.internal.ui.wizards;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties", + org.eclipse.papyrus.uml.decoratormodel.ui.providers +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.ui.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java index 7877625fea4..e18ed782b6d 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java @@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jface.dialogs.DialogSettings; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.papyrus.infra.ui.util.ICallableWithProgress; +import org.eclipse.papyrus.infra.tools.util.IProgressCallable; import org.eclipse.papyrus.infra.ui.util.UIUtil; import org.eclipse.papyrus.uml.decoratormodel.helper.DecoratorModelUtils; import org.eclipse.papyrus.uml.decoratormodel.internal.resource.DecoratorModelCopier; @@ -87,7 +87,7 @@ public class DuplicateDecoratorModelWizard extends Wizard { if (!profileURIs.isEmpty() && (resourceURI != null)) { try { - result = UIUtil.call(getContainer(), false, false, new ICallableWithProgress<Boolean>() { + result = UIUtil.call(getContainer(), false, false, new IProgressCallable<Boolean>() { @Override public Boolean call(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project index cb1b41de6a3..b6836ffdd42 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF index e0f1b210c86..d44877b9cdb 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF @@ -1,43 +1,34 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.eclipse.uml2.common;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.decoratormodel,
- org.eclipse.papyrus.uml.decoratormodel.helper,
- org.eclipse.papyrus.uml.decoratormodel.internal.commands;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.expressions;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.messages;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.internal.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui",
- org.eclipse.papyrus.uml.decoratormodel.internal.resource;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui,
- org.eclipse.papyrus.uml.decoratormodel.properties,
- org.eclipse.papyrus.uml.decoratormodel.controlmode",
- org.eclipse.papyrus.uml.decoratormodel.internal.resource.index;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.model,
- org.eclipse.papyrus.uml.decoratormodel.profileExternalization,
- org.eclipse.papyrus.uml.decoratormodel.profileExternalization.impl,
- org.eclipse.papyrus.uml.decoratormodel.profileExternalization.internal.operations;x-internal:=true,
- org.eclipse.papyrus.uml.decoratormodel.profileExternalization.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.decoratormodel.internal.expressions
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.uml.decoratormodel, + org.eclipse.papyrus.uml.decoratormodel.helper, + org.eclipse.papyrus.uml.decoratormodel.internal.commands;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.expressions;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.messages;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.internal.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui", + org.eclipse.papyrus.uml.decoratormodel.internal.resource;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui, + org.eclipse.papyrus.uml.decoratormodel.properties, + org.eclipse.papyrus.uml.decoratormodel.controlmode", + org.eclipse.papyrus.uml.decoratormodel.internal.resource.index;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.model, + org.eclipse.papyrus.uml.decoratormodel.profileExternalization, + org.eclipse.papyrus.uml.decoratormodel.profileExternalization.impl, + org.eclipse.papyrus.uml.decoratormodel.profileExternalization.internal.operations;x-internal:=true, + org.eclipse.papyrus.uml.decoratormodel.profileExternalization.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.decoratormodel.internal.expressions +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project index 2b3996b1ea0..01ca01b22c4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.activity</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.activity</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF index 6f0f58b2e82..3e7c9822827 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF @@ -32,69 +32,27 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.expressions, - org.eclipse.ui.navigator, - org.eclipse.ui.navigator.resources, - org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.ocl.ecore, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.uml2.uml, - org.eclipse.emf.validation, - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.editor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.jface, - org.eclipse.ui.views, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.draw2d;visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.emf.validation.ocl;visibility:=reexport, - org.eclipse.gef, - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.e4.ui.css.core, - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - org.eclipse.core.databinding, - org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, + org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", + org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project index 2838f0c32a5..edbda77e46a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.clazz</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>
- <buildCommand>
- <name>net.sourceforge.metrics.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>net.sourceforge.metrics.nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.clazz</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> + <buildCommand> + <name>net.sourceforge.metrics.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>net.sourceforge.metrics.nature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF index 4fdba116065..084bb754809 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF @@ -27,71 +27,27 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.expressions, - org.eclipse.ui.navigator, - org.eclipse.ui.navigator.resources, - org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.ocl.ecore, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0", - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.uml2.uml, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.ui, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.jface, - org.eclipse.ui.views, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.emf.validation;visibility:=reexport, - org.eclipse.gef, +Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)", org.apache.batik.util;bundle-version="[1.6.0,1.7.0)", org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)", org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)", - org.w3c.dom.svg, org.apache.batik.css;bundle-version="[1.6.0,1.7.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.types;bundle-version="1.2.0", - org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.2.0" + org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project index 8dbce9f3765..4a6f8e0557b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.common.groups</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.common.groups</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF index 8b0e0011220..12cd43346c4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF @@ -1,27 +1,21 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,
- org.eclipse.papyrus.uml.diagram.common.groups.core.utils,
- org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,
- org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,
- org.eclipse.papyrus.uml.diagram.common.groups.preferences,
- org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,
- org.eclipse.papyrus.uml.diagram.common.groups.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands, + org.eclipse.papyrus.uml.diagram.common.groups.core.utils, + org.eclipse.papyrus.uml.diagram.common.groups.edit.policies, + org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment, + org.eclipse.papyrus.uml.diagram.common.groups.preferences, + org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance, + org.eclipse.papyrus.uml.diagram.common.groups.utils +Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project index 9cd85d73a58..4c65fe84f17 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.common.palette.customaction</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.common.palette.customaction</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF index 61b7943cf33..5d4524292e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF @@ -1,29 +1,15 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.ui.forms;bundle-version="3.5.100",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.gef;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,
- org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,
- org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,
- org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.palette.customaction.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.palette.customaction;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers, + org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt, + org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox, + org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.palette.customaction.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.palette.customaction;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project index 963f2cccf0a..0afd270191d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project @@ -20,11 +20,29 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF index 3ecaf52fdd9..6b382e4a8cd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF @@ -51,72 +51,37 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0", - org.eclipse.papyrus.editor;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.3.0", - org.eclipse.ui, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.actions, - org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0", - org.eclipse.core.expressions, - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.printing, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.uml.profile;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.jface, - org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.localizer;bundle-version="1.2.0", +Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.services.localizer;bundle-version="[1.2.0,2.0.0)", org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)", - org.w3c.dom.svg, org.apache.batik.css;bundle-version="[1.6.0,1.7.0)", org.apache.batik.util;bundle-version="[1.6.0,1.7.0)", org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="1.2.0", - org.eclipse.e4.ui.css.core, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - org.eclipse.gef, - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.emf.common, - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" + org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.modelrepair;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", + org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-Version: 1.2.0.qualifier Eclipse-BuddyPolicy: dependent diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project index 4f1bf07ccf5..649c55f23e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.communication</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.communication</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF index 2942ab1f6e8..e3d8bab813c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF @@ -24,59 +24,24 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.ocl.ecore, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.uml2.uml.resources;bundle-version="3.0.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.ui.navigator.resources;bundle-version="3.4.400", - org.eclipse.ui.navigator;bundle-version="3.5.200", - org.eclipse.core.expressions;bundle-version="3.4.400", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.jface, - org.eclipse.ui.views, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.draw2d;visibility:=reexport, - org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport, - org.eclipse.uml2.uml;visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.emf.validation;visibility:=reexport, - org.eclipse.gef, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.resources;bundle-version="[5.2.0,6.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project index 524095e5ee8..1f7a0d7b52e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.component</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.component</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF index ce803fec621..c747b6edf25 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF @@ -9,65 +9,24 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.jface, - org.eclipse.ui.navigator.resources, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.uml2.uml, - org.eclipse.ocl.ecore, - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.editor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.ui.views, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.draw2d;visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.emf.validation;visibility:=reexport, - org.eclipse.gef, - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.menu;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project index b78e12315ee..c637e855469 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.composite</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.composite</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF index 01c7d4c597b..c746dafc200 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF @@ -31,64 +31,19 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.emf.ecore, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.core.expressions, - org.eclipse.jface, - org.eclipse.ui.views, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.uml2.uml, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.draw2d;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.ocl.ecore;visibility:=reexport, - org.eclipse.emf.validation;visibility:=reexport, - org.eclipse.gef, - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="[1.2.0,2.0.0)", + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project index ccba543b97a..c782a0aebea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF index 0ba913e9a45..0f4aa989ec2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF @@ -1,16 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.gef;bundle-version="3.8.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0", - org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.0.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project index 19661f6acfa..3252b25c451 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.css</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.css</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF index 871ac4b0898..3ac4c9a653e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF @@ -1,17 +1,8 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.7.0", - org.eclipse.e4.ui.css.core;bundle-version="0.10.100", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project index fe1300c9f08..8f7441fcece 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.deployment</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.deployment</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF index 4d5e651e793..ed89286d80c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF @@ -24,53 +24,14 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.ocl.ecore, - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0", - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.jface, - org.eclipse.ui.views, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.draw2d, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.uml2.uml, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.edit, - org.eclipse.emf.validation, - org.eclipse.gef, - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project index b7ebdc8abe8..e972f4414e4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.dnd</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.dnd</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF index 02c51fd531b..a5b15691021 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF @@ -1,28 +1,18 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.dnd,
- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification,
- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,
- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui
-Require-Bundle: org.eclipse.ui,
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: UML Drag and Drop
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.dnd, + org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification, + org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command, + org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.composite;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: UML Drag and Drop +Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd;singleton:=true diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project index 1f18a36c179..c39ee498f0f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.emftree</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.emftree</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF index fc15b8dac81..6fdf057c8ce 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF @@ -1,20 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.emftree
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml.editor;bundle-version="4.1.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.emftree;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.emftree +Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.emftree;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project index f9e1abb7867..bf0127fb9ea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.icons</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.icons</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF index 1c1da81c922..64835c7df33 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.icons;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.icons;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project index f57e2d89482..4fef574785b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.interactionoverview</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.interactionoverview</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF index 2368b688837..5f6f7e26cc2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF @@ -13,53 +13,19 @@ Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview, org.eclipse.papyrus.uml.diagram.interactionoverview.preferences, org.eclipse.papyrus.uml.diagram.interactionoverview.provider, org.eclipse.papyrus.uml.diagram.interactionoverview.utils -Require-Bundle: org.eclipse.ui, - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.uml2.uml;bundle-version="4.0.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.emf.common.ui;bundle-version="2.7.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.2.0", - org.eclipse.ui.navigator;bundle-version="3.5.200", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0", - org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.2.0";resolution:=optional, - org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.2.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0", - org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.activity;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[1.2.0,2.0.0)";resolution:=optional, + org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.communication;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project index b56ed6caf35..8026aaadbbb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF index 6363520a3e7..e9d12326b08 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF @@ -4,22 +4,15 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.linklf;singleton:=true Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.linklf.PapyrusLinkLFActivator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.gmfdiag.common, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.uml.service.types, - org.eclipse.papyrus.infra.services.edit, - org.eclipse.papyrus.uml.diagram.common, - org.eclipse.papyrus.uml.diagram.clazz, - org.eclipse.papyrus.uml.diagram.activity, - org.eclipse.papyrus.uml.diagram.communication, - org.eclipse.papyrus.uml.diagram.component;bundle-version="[1.2.0,1.3.0)", - org.eclipse.papyrus.uml.diagram.composite, - org.eclipse.papyrus.uml.diagram.deployment, - org.eclipse.papyrus.uml.diagram.profile, - org.eclipse.papyrus.infra.gmfdiag.commands +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.activity;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.communication;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.component;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.composite;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.profile;bundle-version="[1.2.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project index 93f9607b886..bbdf34cc357 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.menu</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.menu</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF index 00273717956..d164ee3642c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF @@ -1,44 +1,22 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.menu,
- org.eclipse.papyrus.uml.diagram.menu.actions,
- org.eclipse.papyrus.uml.diagram.menu.actions.handlers
-Require-Bundle: org.eclipse.ui,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.actions,
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",
- org.eclipse.core.expressions,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.actions,
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.menu, + org.eclipse.papyrus.uml.diagram.menu.actions, + org.eclipse.papyrus.uml.diagram.menu.actions.handlers +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project index 6bd72793bdc..8888167d6df 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.modelexplorer</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.modelexplorer</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF index 9ce93ecec5b..1c526657c7f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF @@ -1,33 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.navigator;bundle-version="3.4.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.uml2.uml.editor;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.emf.ecore,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project index 3514764ee00..45dd87eb819 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.navigation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.navigation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF index 86966af6828..aa220411c7d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF @@ -1,14 +1,12 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.navigation
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.draw2d;bundle-version="3.7.1",
- org.eclipse.jface;bundle-version="3.8.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.navigation;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.navigation +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.navigation;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project index 92110db9485..8f76c05a824 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF index cf20e235d1d..be3a4187d2d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF @@ -1,24 +1,22 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.emf.edit,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.edit,
- org.eclipse.uml2.uml,
- org.eclipse.uml2.uml.edit,
- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)", + org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project index b5a8e22aa4d..d49cb5ad54d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.paletteconfiguration</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.paletteconfiguration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF index 7094c183f1e..d33ea647142 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF @@ -1,29 +1,22 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.uml2.uml,
- org.eclipse.ui,
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,
- org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,
- org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,
- org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,
- org.eclipse.papyrus.uml.diagram.paletteconfiguration.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration, + org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor, + org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl, + org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider, + org.eclipse.papyrus.uml.diagram.paletteconfiguration.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project index caf470a3e08..57051138faa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.profile</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.profile</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF index fa042aeafdd..00ea2d7c14e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF @@ -27,66 +27,20 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile;bundle-version="1.2.0", - org.eclipse.core.expressions, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.uml2.uml.edit;bundle-version="4.0.100", - org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0", - org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0", - org.eclipse.ui.navigator;bundle-version="3.5.200", - org.eclipse.ui.navigator.resources;bundle-version="3.4.400", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.jface, - org.eclipse.ui.views, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.draw2d, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.uml2.uml, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.edit, - org.eclipse.ocl.ecore, - org.eclipse.emf.validation, - org.eclipse.gef, - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.core.databinding, - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project index d7d275116ac..a3b4ed3529a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.sequence</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.sequence</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF index 670fb010489..7971106be5c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF @@ -12,51 +12,22 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.expressions, - org.eclipse.ui.navigator, - org.eclipse.ui.navigator.resources, - org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.ocl.ecore, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.ui.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.uml2.uml.edit, - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.menu;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-Version: 1.2.0.qualifier Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin -Import-Package: org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.ui.emf.databinding, - org.eclipse.papyrus.uml.tools.databinding, - org.eclipse.papyrus.infra.properties.contexts, - org.eclipse.papyrus.infra.properties.ui.modelelement Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project index 5c5ab6228b0..0912c3632d4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF index ba378ad840f..30e0b2feb4b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF @@ -24,64 +24,21 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.) Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.expressions, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.edit.ui, - org.eclipse.emf.validation, - org.eclipse.emf.validation.ocl;visibility:=reexport, - org.eclipse.gef, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.jface, - org.eclipse.ocl.ecore, - org.eclipse.papyrus.editor;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.ui.views, - org.eclipse.uml2.uml, - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Ant-Version: Apache Ant 1.7.0 Eclipse-LazyStart: true diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project index c089a144f4f..f58b4d06c9d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.stereotype.edition</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.stereotype.edition</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF index f1a00f50a3d..d909d8ea8e8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF @@ -1,30 +1,17 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,
- org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies,
- org.eclipse.papyrus.uml.diagram.stereotype.edition.provider
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,
- 4.0.0)",
- org.eclipse.gmf.runtime.notation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.edition;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart, + org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies, + org.eclipse.papyrus.uml.diagram.stereotype.edition.provider +Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.edition;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project index db6bdb3701e..86555b78036 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project @@ -1,22 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.symbols.properties</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <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>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.symbols.properties</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF index 92ee89f6f28..2b0a089e60a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.symbols;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.symbols;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-Version: 1.2.0.qualifier Bundle-Name: Symbols Properties diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project index 4aed139c11b..e44b5a369c8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.symbols</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.symbols</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF index 0e78e9aa9d5..ea4b9069273 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF @@ -1,30 +1,17 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.symbols,
- org.eclipse.papyrus.uml.diagram.symbols.provider
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.w3c.dom.svg;bundle-version="1.1.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.symbols, + org.eclipse.papyrus.uml.diagram.symbols.provider +Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project index 4306e573035..d13bb2d8726 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.timing</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.timing</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF index 21b36511abf..435a818f603 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF @@ -24,54 +24,17 @@ Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.emf.ecore, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.core.expressions, - org.eclipse.jface, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.ui.navigator, - org.eclipse.ui.navigator.resources, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.properties, - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.uml2.uml, - org.eclipse.uml2.uml.edit, - org.eclipse.emf.ecore.edit, - org.eclipse.ocl.ecore, - org.eclipse.emf.validation, - org.eclipse.gef, - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.draw2d, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project index a656d182354..3ec60897dd0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.usecase</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.usecase</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF index 8ea0e30f2ed..76445dd7812 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF @@ -22,64 +22,24 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.core.expressions, - org.eclipse.jface, - org.eclipse.ui.ide, - org.eclipse.ui.views, - org.eclipse.gmf.runtime.emf.core, - org.eclipse.gmf.runtime.emf.commands.core, - org.eclipse.gmf.runtime.emf.ui.properties, - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.providers.ide, - org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, - org.eclipse.uml2.uml, - org.eclipse.gmf.runtime.draw2d.ui, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.emf.validation, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2", - org.eclipse.ui.navigator;bundle-version="3.5.200", - org.eclipse.ocl.ecore;bundle-version="3.2.0", - org.eclipse.ui.navigator.resources;bundle-version="3.4.400", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.draw2d;visibility:=reexport, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.edit;visibility:=reexport, - org.eclipse.gef, - org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.types;bundle-version="1.2.0", - org.eclipse.core.databinding.observable, - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project index 1cba13b6edb..26ff1c735ec 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project @@ -1,38 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.wizards</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.m2m.qvt.oml.project.QVTOBuilder</name>
- <arguments>
- <dictionary>
- <key>src_container</key>
- <value>transforms</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.wizards</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.m2m.qvt.oml.project.QVTOBuilder</name> + <arguments> + <dictionary> + <key>src_container</key> + <value>transforms</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF index ff7f5332b93..7ad553cd734 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF @@ -1,48 +1,30 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.wizards;uses:="org.eclipse.ui.plugin,
- org.osgi.framework,
- org.eclipse.papyrus.infra.core.log",
- org.eclipse.papyrus.uml.diagram.wizards.category,
- org.eclipse.papyrus.uml.diagram.wizards.command,
- org.eclipse.papyrus.uml.diagram.wizards.kind,
- org.eclipse.papyrus.uml.diagram.wizards.messages,
- org.eclipse.papyrus.uml.diagram.wizards.pages,
- org.eclipse.papyrus.uml.diagram.wizards.providers,
- org.eclipse.papyrus.uml.diagram.wizards.template,
- org.eclipse.papyrus.uml.diagram.wizards.transformation,
- org.eclipse.papyrus.uml.diagram.wizards.utils,
- org.eclipse.papyrus.uml.diagram.wizards.wizards
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",
- org.eclipse.emf.edit.ui;bundle-version="2.4.0",
- org.eclipse.emf.ecore.edit;bundle-version="2.4.0",
- org.eclipse.ui.intro;bundle-version="3.4.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0";visibility:=reexport,
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.help;bundle-version="3.6.0",
- org.eclipse.papyrus.uml.extensionpoints,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Bundle-Vendor: %pluginProvider
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.diagram.wizards, + org.eclipse.papyrus.uml.diagram.wizards.category, + org.eclipse.papyrus.uml.diagram.wizards.command, + org.eclipse.papyrus.uml.diagram.wizards.kind, + org.eclipse.papyrus.uml.diagram.wizards.messages, + org.eclipse.papyrus.uml.diagram.wizards.pages, + org.eclipse.papyrus.uml.diagram.wizards.providers, + org.eclipse.papyrus.uml.diagram.wizards.template, + org.eclipse.papyrus.uml.diagram.wizards.transformation, + org.eclipse.papyrus.uml.diagram.wizards.utils, + org.eclipse.papyrus.uml.diagram.wizards.wizards +Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)", + org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.help;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %pluginProvider +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project index 15c8fb9cf9e..f13bdf452b4 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.modelexplorer.widgets</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.modelexplorer.widgets</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF index e27f3fa14a1..9297ac33329 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF @@ -1,20 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.modelexplorer.widgets
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.modelexplorer.widgets +Require-Bundle: org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.widgets +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project index 0505aedf2a3..e826b092baa 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.modelexplorer</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.papyrus.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.modelexplorer</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF index 5076ad882d5..116346da38e 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF @@ -4,41 +4,11 @@ Export-Package: org.eclipse.papyrus.uml.modelexplorer, org.eclipse.papyrus.uml.modelexplorer.handler, org.eclipse.papyrus.uml.modelexplorer.queries, org.eclipse.papyrus.uml.modelexplorer.util -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0", - org.eclipse.ui.navigator;bundle-version="3.4.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.uml2.uml;bundle-version="4.0.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", - org.eclipse.emf.ecore, - org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0", - org.eclipse.emf.edit.ui;bundle-version="2.11.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.core.expressions, - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.newchild;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project index 6c0347ffde1..e9edf06b23a 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable.clazz.config</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.clazz.config</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF index c3af8cac1bb..2c10e39ed10 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF @@ -1,19 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.uml.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - ca.odell.glazedlists;bundle-version="1.9.0", - org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0, - 2.0.0)", - org.eclipse.emf.transaction;bundle-version="1.8.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0, - 2.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.0.1", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.uml.nattable.clazz.config, org.eclipse.papyrus.uml.nattable.clazz.config.manager.axis Bundle-Vendor: %Bundle-Vendor diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project index 923ca2e8835..5f716698217 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable.generic.config</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.generic.config</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF index 493272067b0..1f6a8078b35 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF @@ -1,14 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0"
-Export-Package: org.eclipse.papyrus.uml.nattable.generic.config
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: UML Generic Table Config
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.config.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.config;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)" +Export-Package: org.eclipse.papyrus.uml.nattable.generic.config +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: UML Generic Table Config +Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.config.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.config;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project index bff06e5cbd7..f418b7ea2f5 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable.generic</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.generic</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF index c46c00a7dd8..89d7c9c09e0 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF @@ -1,19 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
- org.eclipse.emf.common,
- org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project index 72e7e1a0705..ee1b9ba7994 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable.menu</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.menu</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF index a3be8e06d6c..77d538288d6 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF @@ -3,25 +3,8 @@ Export-Package: org.eclipse.papyrus.uml.nattable.menu, org.eclipse.papyrus.uml.nattable.menu.handlers, org.eclipse.papyrus.uml.nattable.menu.messages, org.eclipse.papyrus.uml.nattable.menu.util -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.gmf.runtime.common.core, - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.core.expressions, - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project index 87f78b5f830..8269dd927ee 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF index fa3a9e161bb..726ab050fd7 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF @@ -1,25 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.emf.transaction;bundle-version="1.9.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - ca.odell.glazedlists;bundle-version="1.9.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.nattable;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.core;bundle-version="1.7.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.nattable;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.uml.nattable.stereotype.display, org.eclipse.papyrus.uml.nattable.stereotype.display.configuration, org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider, diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project index 77452aaf98e..9ca79ebe51b 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable.xtext.integration</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable.xtext.integration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF index c4c2ef9928b..f86fa86381f 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF @@ -2,19 +2,8 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.uml.nattable.xtext.integration, org.eclipse.papyrus.uml.nattable.xtext.integration.celleditor, org.eclipse.papyrus.uml.nattable.xtext.integration.util -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0", - org.eclipse.emf.ecore, - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0", - org.eclipse.xtext;bundle-version="2.4.2", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0, - 2.0.0)", - org.eclipse.gmf.runtime.common.core, - org.eclipse.gmf.runtime.common.ui.services +Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project index 8f91204b6ab..83d95a8a247 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF index fed79a90e67..d679c273371 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF @@ -1,20 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.ui, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="1.2.0", - org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="1.2.0", - com.google.inject, - org.eclipse.papyrus.uml.nattable.xtext.integration;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.nattable.xtext.integration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Export-Package: org.eclipse.papyrus.uml.nattable.xtext.valuespecification, org.eclipse.papyrus.uml.nattable.xtext.valuespecification.celleditor, org.eclipse.papyrus.uml.nattable.xtext.valuespecification.manager.cell diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project index 87987e77a69..05c72172cf3 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.nattable</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.nattable</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF index c9ce2b53278..44a0bba9882 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF @@ -11,33 +11,10 @@ Export-Package: org.eclipse.papyrus.uml.nattable, org.eclipse.papyrus.uml.nattable.utils, org.eclipse.papyrus.uml.nattable.validator, org.eclipse.papyrus.uml.nattable.widget -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.jface, - org.eclipse.core.expressions, - org.eclipse.swt, - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - ca.odell.glazedlists;bundle-version="1.9.0", - org.eclipse.jface.text;bundle-version="3.10.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project index 6bd8c6d9025..5c2639507bb 100644 --- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project +++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF index bf9e41f87bc..d748e85abe6 100644 --- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF @@ -1,15 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.9.100",
- org.eclipse.papyrus.uml.profile.newchildmenu.generator;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.uml.profile.newchildmenu.generator;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project index 74a49b8fedd..50dc17fc6af 100644 --- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project +++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.profile.newchildmenu.generator</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <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>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.profile.newchildmenu.generator</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF index a1f6cece76e..ae6697f117f 100644 --- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF +++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF @@ -1,20 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
- org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.profile.newchildmenu.generator
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.infra.newchild;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.profile.newchildmenu.generator +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/.project b/plugins/uml/org.eclipse.papyrus.uml.appearance/.project index a93dd622464..9b117e29ef5 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.appearance/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.appearance</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.appearance</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF index eb5be03a814..911fae3260a 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF @@ -1,20 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.appearance,
- org.eclipse.papyrus.uml.appearance.commands,
- org.eclipse.papyrus.uml.appearance.helper
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.uml.appearance.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.appearance
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.appearance, + org.eclipse.papyrus.uml.appearance.commands, + org.eclipse.papyrus.uml.appearance.helper +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.uml.appearance.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.appearance +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/.project b/plugins/uml/org.eclipse.papyrus.uml.commands/.project index cd9248930f4..8e5f81162e0 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.commands/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.commands/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.commands</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.commands</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF index b096c0428a4..c8928f44455 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF @@ -1,31 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.common;bundle-version="2.7.0",
- org.eclipse.emf.ecore;bundle-version="2.7.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.commands.command
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.commands.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.commands;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.commands.command +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.commands.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.commands;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project index 3d0f26b8f04..16d96caab44 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.controlmode.profile</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.controlmode.profile</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF index 34404d6b00f..de42a480c4d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF @@ -1,23 +1,11 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.commands, - org.eclipse.emf.ecore, - org.eclipse.equinox.registry, - org.eclipse.gmf.runtime.common.core, - org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0", - org.eclipse.emf.workspace, - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0", - org.eclipse.emf.validation.ui;bundle-version="1.7.0", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0" +Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.validation.ui;bundle-version="[1.7.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project index 647c4a7d5a1..2e267c861cc 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.documentation.profile</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.documentation.profile</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF index 162e16f1f0c..18af6498149 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF @@ -1,19 +1,19 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml
-Export-Package: org.eclipse.papyrus.uml.documentation.Documentation,
- org.eclipse.papyrus.uml.documentation.Documentation.impl,
- org.eclipse.papyrus.uml.documentation.Documentation.util,
- org.eclipse.papyrus.uml.documentation.profile
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.documentation.profile;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.uml.documentation.Documentation, + org.eclipse.papyrus.uml.documentation.Documentation.impl, + org.eclipse.papyrus.uml.documentation.Documentation.util, + org.eclipse.papyrus.uml.documentation.profile +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.documentation.profile;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project index 75682541fd9..084d9b5077d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project @@ -1,33 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.extensionpoints</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.ibm.etools.common.migration.MigrationBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.extensionpoints</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.ibm.etools.common.migration.MigrationBuilder</name> + <arguments> + </arguments> + </buildCommand> + <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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF index 30851acb885..bd15718513b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF @@ -1,21 +1,19 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.uml2.uml,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.emf.mapping.ecore2xml,
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.extensionpoints,
- org.eclipse.papyrus.uml.extensionpoints.library,
- org.eclipse.papyrus.uml.extensionpoints.metamodel,
- org.eclipse.papyrus.uml.extensionpoints.profile,
- org.eclipse.papyrus.uml.extensionpoints.standard,
- org.eclipse.papyrus.uml.extensionpoints.utils
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.extensionpoints.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.extensionpoints;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.ui.views.properties.tabbed;bundle-version="[3.7.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.uml.extensionpoints, + org.eclipse.papyrus.uml.extensionpoints.library, + org.eclipse.papyrus.uml.extensionpoints.metamodel, + org.eclipse.papyrus.uml.extensionpoints.profile, + org.eclipse.papyrus.uml.extensionpoints.standard, + org.eclipse.papyrus.uml.extensionpoints.utils +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.extensionpoints.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.extensionpoints;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project index f2e607fe426..3189281bb43 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF index 6531167d364..f667db051b9 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF @@ -1,24 +1,24 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.filters;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="2.9.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.eclipse.uml2.uml.edit;bundle-version="5.0.0";visibility:=reexport,
- org.eclipse.uml2.common.edit;bundle-version="2.0.0";visibility:=reexport
-Export-Package: org.eclipse.papyrus.uml.filters.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.filters.provider.UMLFiltersEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.uml.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.uml.filters.provider +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.filters.provider.UMLFiltersEditPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/.project b/plugins/uml/org.eclipse.papyrus.uml.filters/.project index 3c6c6df4f39..3c1eefe8df6 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/.project @@ -20,10 +20,32 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF index 78ba264423e..5d21cea0493 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF @@ -1,26 +1,25 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,
- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.eclipse.uml2.common;bundle-version="2.0.100";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0"
-Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true,
- org.eclipse.papyrus.uml.filters,
- org.eclipse.papyrus.uml.filters.impl,
- org.eclipse.papyrus.uml.filters.internal.operations,
- org.eclipse.papyrus.uml.filters.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.UMLFiltersPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + com.google.guava;bundle-version="11.0.0", + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)" +Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true, + org.eclipse.papyrus.uml.filters, + org.eclipse.papyrus.uml.filters.impl, + org.eclipse.papyrus.uml.filters.internal.operations, + org.eclipse.papyrus.uml.filters.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.UMLFiltersPlugin$Implementation +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/org.eclipse.papyrus.uml.icons/.project b/plugins/uml/org.eclipse.papyrus.uml.icons/.project index 75b2e26e7e4..2af1c62ff3f 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.icons/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.icons/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.icons</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.icons</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF index f71b6ccc45c..a340cf2e88d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Export-Package: org.eclipse.papyrus.uml.icons
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.icons.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.icons;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)" +Export-Package: org.eclipse.papyrus.uml.icons +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.icons.Activator +Bundle-SymbolicName: org.eclipse.papyrus.uml.icons;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/.project b/plugins/uml/org.eclipse.papyrus.uml.import/.project index 888ada1bb42..b4b372b52aa 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.import/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.import</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.import</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF index e5267044220..a390b26919e 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF @@ -1,26 +1,14 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.uml2.common.edit,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.importt.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.import;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.importt.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.import;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project index e2dddd88c5d..ddb76c3a7f4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.modelrepair</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.modelrepair</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF index d0a66692331..12c48ee2c33 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF @@ -1,43 +1,24 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.modelrepair,
- org.eclipse.papyrus.uml.modelrepair.handler,
- org.eclipse.papyrus.uml.modelrepair.internal.participants;x-internal:=true,
- org.eclipse.papyrus.uml.modelrepair.internal.stereotypes;x-friends:="org.eclipse.papyrus.migration.rsa",
- org.eclipse.papyrus.uml.modelrepair.internal.validation;x-internal:=true,
- org.eclipse.papyrus.uml.modelrepair.service,
- org.eclipse.papyrus.uml.modelrepair.ui,
- org.eclipse.papyrus.uml.modelrepair.ui.providers,
- org.eclipse.papyrus.uml.modelrepair.validation
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.core.resources;bundle-version="3.8.100",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.9.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.10.0",
- org.eclipse.uml2.uml.edit;bundle-version="5.0.0",
- org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Model Repair
-Bundle-Activator: org.eclipse.papyrus.uml.modelrepair.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.modelrepair, + org.eclipse.papyrus.uml.modelrepair.handler, + org.eclipse.papyrus.uml.modelrepair.internal.participants;x-internal:=true, + org.eclipse.papyrus.uml.modelrepair.internal.stereotypes;x-friends:="org.eclipse.papyrus.migration.rsa", + org.eclipse.papyrus.uml.modelrepair.internal.validation;x-internal:=true, + org.eclipse.papyrus.uml.modelrepair.service, + org.eclipse.papyrus.uml.modelrepair.ui, + org.eclipse.papyrus.uml.modelrepair.ui.providers, + org.eclipse.papyrus.uml.modelrepair.validation +Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Model Repair +Bundle-Activator: org.eclipse.papyrus.uml.modelrepair.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/.project b/plugins/uml/org.eclipse.papyrus.uml.navigation/.project index aa78a240712..6f1f93d4699 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.navigation/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.navigation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.navigation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF index 79d67725a67..409932f93c3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF @@ -1,15 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project index e09a029b02f..1993ba6cfd8 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.oclconstraintevaluation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.oclconstraintevaluation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF index 3ffe9f9e1b5..977d5caabcf 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF @@ -1,17 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.commands;bundle-version="1.2.0",
- org.eclipse.ui.console;bundle-version="3.5.100",
- org.eclipse.ocl.pivot.uml;bundle-version="[1.0.0,
- 2.0.0)",
- org.eclipse.uml2.uml;bundle-version="5.0.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.oclconstraintevaluation.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.oclconstraintevaluation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.uml.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.console;bundle-version="[3.6.0,4.0.0)", + org.eclipse.ocl.pivot.uml;bundle-version="[1.1.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.oclconstraintevaluation.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.oclconstraintevaluation;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/.project b/plugins/uml/org.eclipse.papyrus.uml.perspective/.project index 3d80b2de359..95f1f59d041 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.perspective/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.perspective</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.perspective</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF index e37ed380e4d..b63f49c37ab 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF @@ -1,17 +1,16 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.perspective
-Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.ui.ide;bundle-version="3.6.100",
- org.eclipse.core.runtime;bundle-version="3.6.100",
- org.eclipse.papyrus.views.validation;bundle-version="1.2.0",
- org.eclipse.ui.navigator;bundle-version="3.5.500"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.perspective.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.perspective;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.perspective +Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.views.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.perspective.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.perspective;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.profile/.project index 25b75930090..b62b2179491 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/.project @@ -1,33 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.profile</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.ibm.etools.common.migration.MigrationBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.profile</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.ibm.etools.common.migration.MigrationBuilder</name> + <arguments> + </arguments> + </buildCommand> + <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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF index b53fddad024..e5ad8322262 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF @@ -1,48 +1,32 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.profile,
- org.eclipse.papyrus.uml.profile.constraints,
- org.eclipse.papyrus.uml.profile.definition,
- org.eclipse.papyrus.uml.profile.preference,
- org.eclipse.papyrus.uml.profile.providers,
- org.eclipse.papyrus.uml.profile.service,
- org.eclipse.papyrus.uml.profile.structure,
- org.eclipse.papyrus.uml.profile.tree,
- org.eclipse.papyrus.uml.profile.tree.objects,
- org.eclipse.papyrus.uml.profile.ui.dialogs,
- org.eclipse.papyrus.uml.profile.ui.items,
- org.eclipse.papyrus.uml.profile.utils,
- org.eclipse.papyrus.uml.profile.validation,
- org.eclipse.papyrus.uml.profile.wizard
-Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.ui,
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.uml2.uml.editor;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.profile, + org.eclipse.papyrus.uml.profile.constraints, + org.eclipse.papyrus.uml.profile.definition, + org.eclipse.papyrus.uml.profile.preference, + org.eclipse.papyrus.uml.profile.providers, + org.eclipse.papyrus.uml.profile.service, + org.eclipse.papyrus.uml.profile.structure, + org.eclipse.papyrus.uml.profile.tree, + org.eclipse.papyrus.uml.profile.tree.objects, + org.eclipse.papyrus.uml.profile.ui.dialogs, + org.eclipse.papyrus.uml.profile.ui.items, + org.eclipse.papyrus.uml.profile.utils, + org.eclipse.papyrus.uml.profile.validation, + org.eclipse.papyrus.uml.profile.wizard +Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.modelrepair;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project index ea647c2c603..88883a5ae3d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.resourceloading.profile</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.resourceloading.profile</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF index 59452cb6fcd..448bf599dd3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF @@ -1,12 +1,10 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.resourceloading.profile;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.resourceloading.profile;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project b/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project index ae9fd8fd6a5..3d916874105 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.search.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.search.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF index 565cf6ced20..211b56b216c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF @@ -4,34 +4,18 @@ Export-Package: org.eclipse.papyrus.uml.search.ui.actions, org.eclipse.papyrus.uml.search.ui.query, org.eclipse.papyrus.uml.search.ui.results, org.eclipse.papyrus.uml.search.ui.validator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.search;bundle-version="3.8.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.core.resources;bundle-version="3.8.1", - org.eclipse.papyrus.editor;bundle-version="1.2.0", - org.eclipse.papyrus.views.search;bundle-version="1.2.0", - org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0", - org.eclipse.emf;bundle-version="2.6.0", - org.eclipse.ui.ide;bundle-version="3.8.100", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="4.0.100", - org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.jface, - org.eclipse.emf.transaction, - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.ocl.pivot.uml;bundle-version="1.0.0", - org.eclipse.ocl.examples.xtext.console;bundle-version="4.0.0", - org.eclipse.ltk.ui.refactoring;bundle-version="3.7.100", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0", - org.eclipse.gmf.runtime.notation, - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.search;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ocl.pivot.uml;bundle-version="[1.1.0,2.0.0)", + org.eclipse.ocl.examples.xtext.console;bundle-version="[4.1.0,5.0.0)", + org.eclipse.ltk.ui.refactoring;bundle-version="[3.8.0,4.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)" Bundle-Vendor: %vendorName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project index edb9fa8674d..ef42ad99ecd 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF index 45a58498b8a..b2f2c9769fd 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF @@ -1,33 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0", - org.eclipse.ui.workbench, - org.eclipse.core.expressions, - org.eclipse.jface, - org.eclipse.uml2.uml.edit;bundle-version="4.0.100", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.uml2.uml.profile.standard, - org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.emf.edit.ui, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.emf.ecore;bundle-version="2.11.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0" +Require-Bundle: org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/.project b/plugins/uml/org.eclipse.papyrus.uml.service.types/.project index 994e51097a8..a98142ff579 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.service.types</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.service.types</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF index 2faf54879de..3d62042e9ba 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF @@ -6,29 +6,11 @@ Export-Package: org.eclipse.papyrus.uml.service.types, org.eclipse.papyrus.uml.service.types.helper, org.eclipse.papyrus.uml.service.types.helper.advice, org.eclipse.papyrus.uml.service.types.utils -Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0", - org.eclipse.core.expressions, - org.eclipse.uml2.uml.edit;bundle-version="4.0.100", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.uml2.uml.profile.standard, - org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.emf.ecore;bundle-version="2.11.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.types.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project b/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project index 6ab636d770f..90d2f05bbcf 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.service.validation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.service.validation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF index a7e2f7e9e3b..804905fe522 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF @@ -1,23 +1,18 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.service.validation,
- org.eclipse.papyrus.uml.service.validation.internal;x-internal:=true,
- org.eclipse.papyrus.uml.service.validation.oclpivot
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.ocl.pivot;bundle-version="1.0.0",
- org.eclipse.ocl.pivot.uml;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
-Bundle-Vendor: %pluginProvider
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.service.validation.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.service.validation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.service.validation, + org.eclipse.papyrus.uml.service.validation.internal;x-internal:=true, + org.eclipse.papyrus.uml.service.validation.oclpivot +Require-Bundle: org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ocl.pivot.uml;bundle-version="[1.1.0,2.0.0)" +Bundle-Vendor: %pluginProvider +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.service.validation.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.service.validation;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project index da7a6039bb4..294a796ab75 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.services.decoration</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.services.decoration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF index 814567f1f10..8bd218753c7 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF @@ -1,21 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.apache.commons.lang;bundle-version="2.4.0",
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.services.decoration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.services.decoration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.services.decoration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.services.decoration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project index 13fae6badfe..4355b5a99c0 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.templaterepository</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.templaterepository</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF index 2905f387580..b3b6b854afa 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF @@ -1,17 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.templaterepository
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.templaterepository.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.templaterepository;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.uml.templaterepository +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.templaterepository.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.templaterepository;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/.project b/plugins/uml/org.eclipse.papyrus.uml.types.core/.project index 6656315c90a..7cb455601cf 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.types.core/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.types.core</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.types.core</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF index c07477230e8..083941362e4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF @@ -1,55 +1,38 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.infra.types;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.swt,
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.types.rulebased;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.ui.workbench,
- org.eclipse.papyrus.infra.emf.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.types.core,
- org.eclipse.papyrus.uml.types.core.advices.applystereotype,
- org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl,
- org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider,
- org.eclipse.papyrus.uml.types.core.advices.applystereotype.util,
- org.eclipse.papyrus.uml.types.core.advices.settype,
- org.eclipse.papyrus.uml.types.core.advices.settype.impl,
- org.eclipse.papyrus.uml.types.core.advices.settype.provider,
- org.eclipse.papyrus.uml.types.core.advices.settype.util,
- org.eclipse.papyrus.uml.types.core.commands,
- org.eclipse.papyrus.uml.types.core.edithelper,
- org.eclipse.papyrus.uml.types.core.matchers.stereotype,
- org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl,
- org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider,
- org.eclipse.papyrus.uml.types.core.matchers.stereotype.util,
- org.eclipse.papyrus.uml.types.core.requests,
- org.eclipse.papyrus.uml.types.core.rules,
- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype,
- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl,
- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider,
- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider.InvariantStereotypeRuleConfigurationEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.types;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.uml.types.core, + org.eclipse.papyrus.uml.types.core.advices.applystereotype, + org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl, + org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider, + org.eclipse.papyrus.uml.types.core.advices.applystereotype.util, + org.eclipse.papyrus.uml.types.core.advices.settype, + org.eclipse.papyrus.uml.types.core.advices.settype.impl, + org.eclipse.papyrus.uml.types.core.advices.settype.provider, + org.eclipse.papyrus.uml.types.core.advices.settype.util, + org.eclipse.papyrus.uml.types.core.commands, + org.eclipse.papyrus.uml.types.core.edithelper, + org.eclipse.papyrus.uml.types.core.matchers.stereotype, + org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl, + org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider, + org.eclipse.papyrus.uml.types.core.matchers.stereotype.util, + org.eclipse.papyrus.uml.types.core.requests, + org.eclipse.papyrus.uml.types.core.rules, + org.eclipse.papyrus.uml.types.core.rules.invariantstereotype, + org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl, + org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider, + org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider.InvariantStereotypeRuleConfigurationEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project index fbeba4f82ac..3b1cd629141 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.ui.perspectiveconfiguration</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.ui.perspectiveconfiguration</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF index d7b797532c9..8ec584887b3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF @@ -1,14 +1,12 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.ui.perspectiveconfiguration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.ui.perspectiveconfiguration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.ui.perspectiveconfiguration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.ui.perspectiveconfiguration;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui/.project b/plugins/uml/org.eclipse.papyrus.uml.ui/.project index 1d8aa5623a4..02eee166cf5 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.ui/.project +++ b/plugins/uml/org.eclipse.papyrus.uml.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF index a43dbbc63d6..ef8d6d7102e 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF @@ -1,36 +1,14 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.uml.ui.internal.adapters;x-internal:=true -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.uml2.uml;bundle-version="4.1.0";visibility:=reexport, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.core.databinding.property;bundle-version="1.4.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.uml2.common.edit;bundle-version="1.6.0", - org.eclipse.uml2.uml.edit;bundle-version="4.0.0", - org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.core.expressions;bundle-version="3.4.0", - org.eclipse.uml2.uml, - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0", - org.eclipse.uml2.uml.validation;bundle-version="5.0.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.jface.text;bundle-version="3.10.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0" +Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml.validation;bundle-version="[5.0.0,6.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project index 3b08355ec69..764d7b16364 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.profile.drafter.documentation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.profile.drafter.documentation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project index 1af56d1d554..b57cf827395 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project @@ -1,28 +1,50 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.profile.drafter</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.profile.drafter</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF index 859a9085f13..0799eab4c15 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF @@ -1,32 +1,12 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.expressions, - org.eclipse.emf.common, - org.eclipse.emf.transaction, - org.eclipse.gmf.runtime.notation.edit, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0", - org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.uml2.uml, - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.core.databinding, - org.eclipse.core.databinding.beans, - org.eclipse.core.databinding.observable, - org.eclipse.core.databinding.property, - org.eclipse.jface.databinding, - com.ibm.icu, - org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", + com.ibm.icu Export-Package: org.eclipse.papyrus.uml.profile.drafter, org.eclipse.papyrus.uml.profile.drafter.exceptions, org.eclipse.papyrus.uml.profile.drafter.ui.handler, diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project index 1d798513068..1d2751ac903 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.properties.xtext</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.properties.xtext</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF index 931b08284da..90ae9fed076 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF @@ -1,25 +1,7 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui;bundle-version="3.105.0", - org.eclipse.ui.forms;bundle-version="3.6.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0", - org.eclipse.emf.ecore;bundle-version="2.9.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0", - org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.7.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0", - org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0", - org.eclipse.xtext;bundle-version="2.4.2", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.core.databinding;bundle-version="1.4.100", - org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project index b8670ab1c97..f25e6c48e8c 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.properties</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.papyrus.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.properties</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF index fb233953585..80a5faa3fde 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF @@ -16,48 +16,16 @@ Export-Package: org.eclipse.papyrus.uml.properties.constraints, org.eclipse.papyrus.uml.properties.profile.ui.views, org.eclipse.papyrus.uml.properties.util, org.eclipse.papyrus.uml.properties.widgets -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.jface;bundle-version="3.6.1", - org.eclipse.core.databinding.property;bundle-version="1.3.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.ui;bundle-version="3.6.1", - org.eclipse.papyrus.uml.profile;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.0.0", - org.eclipse.uml2.common.edit;bundle-version="1.6.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="3.8.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.gef;bundle-version="3.8.1", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0", - org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)", - org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0", - org.eclipse.papyrus.uml.nattable.stereotype.display;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.nattable.stereotype.display;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.properties.constraints" Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project index 20c1bba8c2a..0d6cc9d3d88 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF index a73de87b2e1..10f52ec689b 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF @@ -1,36 +1,21 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.1.1",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.internal.UmlCollaborationUseActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.internal.UmlCollaborationUseActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project index b9e7669247c..ff2f21be093 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF index cfc0f2abef7..f0be3ba429a 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF @@ -1,40 +1,33 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.generator,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.services,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.impl,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.util,
- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.validation
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0";visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.formatting, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.generator, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.scoping, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.serializer, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.services, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.impl, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.util, + org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.validation +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project index 369d7dd0b4c..94ffbce0356 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.common.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.common.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF index 3a02a600672..ecb6fab4f64 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF @@ -1,33 +1,27 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext.ui,
- org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr.internal,
- org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal,
- org.eclipse.papyrus.uml.textedit.common.xtext.ui.labeling,
- org.eclipse.papyrus.uml.textedit.common.xtext.ui.outline,
- org.eclipse.papyrus.uml.textedit.common.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal.UmlCommonActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext.ui, + org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr.internal, + org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal, + org.eclipse.papyrus.uml.textedit.common.xtext.ui.labeling, + org.eclipse.papyrus.uml.textedit.common.xtext.ui.outline, + org.eclipse.papyrus.uml.textedit.common.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal.UmlCommonActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project index fd4f8c8830d..bc37b26f9dd 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.common.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.common.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF index f7932c07928..22b183c1757 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF @@ -1,44 +1,36 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.1",
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext,
- org.eclipse.papyrus.uml.textedit.common.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.common.xtext.generator,
- org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.common.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.common.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.common.xtext.services,
- org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon,
- org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.impl,
- org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.util,
- org.eclipse.papyrus.uml.textedit.common.xtext.validation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.jface;bundle-version="[3.12.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext, + org.eclipse.papyrus.uml.textedit.common.xtext.formatting, + org.eclipse.papyrus.uml.textedit.common.xtext.generator, + org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.common.xtext.scoping, + org.eclipse.papyrus.uml.textedit.common.xtext.serializer, + org.eclipse.papyrus.uml.textedit.common.xtext.services, + org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon, + org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.impl, + org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.util, + org.eclipse.papyrus.uml.textedit.common.xtext.validation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project index 9ca32572cc7..9c3d38f3b35 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> 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 91eea70e609..69eef4db640 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 @@ -1,33 +1,23 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;bundle-version="1.2.0",
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.200",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.internal.UMLConnectionPointReferenceActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.internal.UMLConnectionPointReferenceActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project index f6ad632b1c0..3579c81e3c4 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF index 6110ca34347..a783b7d7f1c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF @@ -1,38 +1,32 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.generator,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.services,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.impl,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.util,
- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.validation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.formatting, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.generator, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.scoping, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.serializer, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.services, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.impl, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.util, + org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.validation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project index cbecfdae5a5..c8fdad0d014 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF index d0e53d70d53..6d6cb28993f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF @@ -1,25 +1,18 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",
- org.eclipse.ocl.pivot.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.UMLConstraintEditorActivator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ocl.pivot.ui;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.UMLConstraintEditorActivator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project index ff2e77035dd..c7b4247304f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.javaconstraint</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.javaconstraint</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF index 4bbc85fa4db..ad4abe66c1b 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF @@ -1,21 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.javaconstraint
-Require-Bundle: org.eclipse.ui,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.jface.text,
- org.eclipse.emf.transaction,
- org.eclipse.uml2.uml,
- org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.javaconstraint.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.javaconstraint;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.javaconstraint +Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.textedit.javaconstraint.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.javaconstraint;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project index bb144941801..85cd03aa5fa 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.message.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.message.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF index 4157f2829c2..7e06d2d8376 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF @@ -1,36 +1,24 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.message.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.core.expressions;bundle-version="3.4.200",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.message.xtext.ui.internal.UmlMessageActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.message.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.communication;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.message.xtext.ui.internal.UmlMessageActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project index 7ce9e977006..bf96e8b62b4 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.message.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.message.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF index 5ab167af1ce..1b940abe7a8 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF @@ -1,40 +1,34 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext,
- org.eclipse.papyrus.uml.textedit.message.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.message.xtext.generator,
- org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.message.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.message.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.message.xtext.services,
- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage,
- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl,
- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.util,
- org.eclipse.papyrus.uml.textedit.message.xtext.validation
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",
- org.eclipse.xtext.xbase.lib
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext, + org.eclipse.papyrus.uml.textedit.message.xtext.formatting, + org.eclipse.papyrus.uml.textedit.message.xtext.generator, + org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.message.xtext.scoping, + org.eclipse.papyrus.uml.textedit.message.xtext.serializer, + org.eclipse.papyrus.uml.textedit.message.xtext.services, + org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage, + org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl, + org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.util, + org.eclipse.papyrus.uml.textedit.message.xtext.validation +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project index 5cf40888788..a5704185cce 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF index 65f212a6ce6..b17ce01c284 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF @@ -1,35 +1,24 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.textedit.parameter.xtext;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.internal.UmlParameterActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions, + org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.textedit.parameter.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.internal.UmlParameterActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project index 732d86ba1ba..b649372f572 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.parameter.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.parameter.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF index 3f068158587..4c42bbe911f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF @@ -1,40 +1,33 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.generator,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.services,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.impl,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.util,
- org.eclipse.papyrus.uml.textedit.parameter.xtext.validation
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",
- org.eclipse.xtext.xbase.lib
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext, + org.eclipse.papyrus.uml.textedit.parameter.xtext.formatting, + org.eclipse.papyrus.uml.textedit.parameter.xtext.generator, + org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.parameter.xtext.scoping, + org.eclipse.papyrus.uml.textedit.parameter.xtext.serializer, + org.eclipse.papyrus.uml.textedit.parameter.xtext.services, + org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter, + org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.impl, + org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.util, + org.eclipse.papyrus.uml.textedit.parameter.xtext.validation +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project index 32c3f268785..24d06d585fc 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.port.xtext.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.port.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF index 351d6b6f686..aab7279e816 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF @@ -1,39 +1,29 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext.ui,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr.internal,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contribution,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.labeling,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.outline,
- org.eclipse.papyrus.uml.textedit.port.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext.ui,
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui.editors,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.papyrus.uml.textedit.port.xtext;bundle-version="1.2.0",
- org.eclipse.emf.transaction,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal.UmlPortActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext.ui, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr.internal, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.contribution, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.labeling, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.outline, + org.eclipse.papyrus.uml.textedit.port.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.textedit.port.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal.UmlPortActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project index 4f933ab959f..400e14bab04 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.port.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.port.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF index b640a58d088..e7faccd1850 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF @@ -1,40 +1,34 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext,
- org.eclipse.papyrus.uml.textedit.port.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.port.xtext.generator,
- org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.port.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.port.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.port.xtext.services,
- org.eclipse.papyrus.uml.textedit.port.xtext.umlPort,
- org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.impl,
- org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.util,
- org.eclipse.papyrus.uml.textedit.port.xtext.validation
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.xbase;resolution:=optional,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.9.0",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",
- org.eclipse.xtext.xbase.lib
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext, + org.eclipse.papyrus.uml.textedit.port.xtext.formatting, + org.eclipse.papyrus.uml.textedit.port.xtext.generator, + org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.port.xtext.scoping, + org.eclipse.papyrus.uml.textedit.port.xtext.serializer, + org.eclipse.papyrus.uml.textedit.port.xtext.services, + org.eclipse.papyrus.uml.textedit.port.xtext.umlPort, + org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.impl, + org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.util, + org.eclipse.papyrus.uml.textedit.port.xtext.validation +Require-Bundle: org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project index 3e661517be2..7ed4f1e1574 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.property.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.property.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF index 66c88f05641..7bc449d30a4 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF @@ -1,39 +1,29 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext.ui,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr.internal,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contributions,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.labeling,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.outline,
- org.eclipse.papyrus.uml.textedit.property.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.textedit.property.xtext;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.antlr.runtime,
- org.eclipse.xtext.builder,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.200",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal.UmlPropertyActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext.ui, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr.internal, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.contributions, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.labeling, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.outline, + org.eclipse.papyrus.uml.textedit.property.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.textedit.property.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal.UmlPropertyActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project index b3763c47d78..02b1ecc9eef 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.property.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.property.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF index 65862bb9139..3fbcf84b7c1 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF @@ -1,41 +1,34 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.xtext.xbase.lib
-Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext,
- org.eclipse.papyrus.uml.textedit.property.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.property.xtext.generator,
- org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.property.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.property.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.property.xtext.services,
- org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty,
- org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.impl,
- org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.util,
- org.eclipse.papyrus.uml.textedit.property.xtext.validation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext, + org.eclipse.papyrus.uml.textedit.property.xtext.formatting, + org.eclipse.papyrus.uml.textedit.property.xtext.generator, + org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.property.xtext.scoping, + org.eclipse.papyrus.uml.textedit.property.xtext.serializer, + org.eclipse.papyrus.uml.textedit.property.xtext.services, + org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty, + org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.impl, + org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.util, + org.eclipse.papyrus.uml.textedit.property.xtext.validation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project index 58ef9d920c1..fc9be8c7d15 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.state.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.state.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF index 9e6d12bb9cf..a1877fee927 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF @@ -1,33 +1,22 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.state.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="1.2.0",
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.antlr.runtime,
- org.eclipse.xtext.builder,
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.core.expressions;bundle-version="3.4.200",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.state.xtext.ui.internal.UmlStateActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.state.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.state.xtext.ui.internal.UmlStateActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project index 98ae44994fa..c381cfda046 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.state.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.state.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF index 50513fa4e96..25f4cc6dd5a 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF @@ -1,39 +1,33 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext,
- org.eclipse.papyrus.uml.textedit.state.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.state.xtext.generator,
- org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.state.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.state.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.state.xtext.services,
- org.eclipse.papyrus.uml.textedit.state.xtext.umlState,
- org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl,
- org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util,
- org.eclipse.papyrus.uml.textedit.state.xtext.validation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext, + org.eclipse.papyrus.uml.textedit.state.xtext.formatting, + org.eclipse.papyrus.uml.textedit.state.xtext.generator, + org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.state.xtext.scoping, + org.eclipse.papyrus.uml.textedit.state.xtext.serializer, + org.eclipse.papyrus.uml.textedit.state.xtext.services, + org.eclipse.papyrus.uml.textedit.state.xtext.umlState, + org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl, + org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util, + org.eclipse.papyrus.uml.textedit.state.xtext.validation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project index 95b0ea4721b..d26cd74a058 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF index c149c6d8aac..3b56cc53739 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF @@ -1,41 +1,28 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr.internal,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contributions,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.labeling,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.outline,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.quickfix
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle-version="1.2.0",
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.papyrus.uml.alf.ui;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.uml.commands;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.200",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal.AppliedStereotypePropertyActivator
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr.internal, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contributions, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.labeling, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.outline, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.quickfix +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.uml.alf.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal.AppliedStereotypePropertyActivator +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui;singleton:=true diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project index 3fd898362de..998c7456045 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project @@ -1,34 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF index b3f36bb8408..b53346eb1e3 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF @@ -1,49 +1,37 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.impl,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.util,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.formatting;uses:="org.eclipse.xtext.formatting.impl",
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.generator;uses:="org.eclipse.emf.ecore.resource,
- org.eclipse.xtext.generator",
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.scoping;uses:="org.eclipse.papyrus.alf.scoping",
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.services,
- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.validation
-Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.1",
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",
- org.eclipse.xtext.xbase.lib
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.impl, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.util, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.formatting, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.generator, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.scoping, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.serializer, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.services, + org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.validation +Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport, + org.apache.log4j;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport, + org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project index 69ec1ec4c3e..aae59623684 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.transition.xtext.ui</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.transition.xtext.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF index 41a2a7ecfc9..619fbdbe4e7 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF @@ -1,38 +1,28 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.textedit.transition.xtext;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.200",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext.ui,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr.internal,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contributions,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.editor,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.labeling,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.outline,
- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.quickfix
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal.UmlTransitionActivator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.uml.textedit.transition.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext.ui, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr.internal, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contributions, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.editor, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.labeling, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.outline, + org.eclipse.papyrus.uml.textedit.transition.xtext.ui.quickfix +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal.UmlTransitionActivator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project index c16ff2df3af..bd5afd5b7ba 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project @@ -1,34 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.textedit.transition.xtext</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>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.textedit.transition.xtext</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> + <buildCommand> + <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.missing.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF index 27cf25bf31e..3f4ee14bf65 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF @@ -1,37 +1,31 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext,
- org.eclipse.papyrus.uml.textedit.transition.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.transition.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.transition.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.transition.xtext.services,
- org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition,
- org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.impl,
- org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.util,
- org.eclipse.papyrus.uml.textedit.transition.xtext.validation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Import-Package: org.apache.log4j
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + com.ibm.icu;resolution:=optional, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext, + org.eclipse.papyrus.uml.textedit.transition.xtext.formatting, + org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.transition.xtext.scoping, + org.eclipse.papyrus.uml.textedit.transition.xtext.serializer, + org.eclipse.papyrus.uml.textedit.transition.xtext.services, + org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition, + org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.impl, + org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.util, + org.eclipse.papyrus.uml.textedit.transition.xtext.validation +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project index b8b4db247c1..6d2761dd268 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF index cdd426d33a3..366fec99989 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF @@ -1,37 +1,26 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr.internal,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contribution,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.labeling,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.outline,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.quickfix
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext.ui,
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui.editors,
- org.eclipse.xtext.builder,
- org.antlr.runtime,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.apache.log4j,
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal.UmlValueSpecificationActivator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr.internal, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contribution, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.labeling, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.outline, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.quickfix +Require-Bundle: org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)", + org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal.UmlValueSpecificationActivator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project index 8399f261ed4..5b4e535961f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF index e7058601403..7f412a36145 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF @@ -1,28 +1,18 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",
- com.google.inject,
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.xtext,
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",
- org.eclipse.ui.workbench,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;uses:="org.osgi.framework",
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.commands
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.textedit.valuespecification.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.commands +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project index 8227d335487..1ebdd4c9560 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project @@ -25,10 +25,28 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF index 82c5e7541c7..b0e3fa9805f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF @@ -1,41 +1,35 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtext,
- org.eclipse.xtext.xbase;resolution:=optional,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="1.9.0",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.apache.log4j,
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",
- org.eclipse.xtext.xbase.lib,
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.formatting,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.generator,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr.internal,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.scoping,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.serializer,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.services,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.validation,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext;singleton:=true
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.formatting, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.generator, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr.internal, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.scoping, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.serializer, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.services, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.validation, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl, + org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.util +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext;singleton:=true +Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", + org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project index e34239b9d48..bdcd46debbd 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.tools.extendedtypes</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.tools.extendedtypes</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF index 0c67abcd433..3c031558f2b 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF @@ -1,18 +1,11 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.swt, - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.uml.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0" +Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.papyrus.uml.tools.extendedtypes, org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration, org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl, diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project index 41cb67dc32e..7b23e278812 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project @@ -1,33 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.tools.utils</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.ibm.etools.common.migration.MigrationBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.tools.utils</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.ibm.etools.common.migration.MigrationBuilder</name> + <arguments> + </arguments> + </buildCommand> + <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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF index 68a9cba3545..186c44bc435 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF @@ -1,25 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.tools.utils
-Require-Bundle: org.eclipse.uml2.uml,
- org.eclipse.jface;bundle-version="3.4.1",
- org.eclipse.emf.transaction;bundle-version="1.2.1",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.ui.workbench;bundle-version="3.105.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %pluginProvider
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.tools.utils +Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %pluginProvider +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project index 8d8af580825..38a643d7683 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.tools</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.tools</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF index 459f2aa312d..d67d9c4edfc 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF @@ -1,54 +1,34 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.tools,
- org.eclipse.papyrus.uml.tools.adapters,
- org.eclipse.papyrus.uml.tools.commands,
- org.eclipse.papyrus.uml.tools.databinding,
- org.eclipse.papyrus.uml.tools.helper,
- org.eclipse.papyrus.uml.tools.importsources,
- org.eclipse.papyrus.uml.tools.listeners,
- org.eclipse.papyrus.uml.tools.model,
- org.eclipse.papyrus.uml.tools.namereferences,
- org.eclipse.papyrus.uml.tools.profile.definition,
- org.eclipse.papyrus.uml.tools.profile.index,
- org.eclipse.papyrus.uml.tools.providers,
- org.eclipse.papyrus.uml.tools.service,
- org.eclipse.papyrus.uml.tools.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="4.1.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.core.databinding.property;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.uml2.common.edit;bundle-version="1.6.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.uml2.uml.validation;bundle-version="5.0.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.jface.text;bundle-version="3.10.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: UML Tools
-Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.tools, + org.eclipse.papyrus.uml.tools.adapters, + org.eclipse.papyrus.uml.tools.commands, + org.eclipse.papyrus.uml.tools.databinding, + org.eclipse.papyrus.uml.tools.helper, + org.eclipse.papyrus.uml.tools.importsources, + org.eclipse.papyrus.uml.tools.listeners, + org.eclipse.papyrus.uml.tools.model, + org.eclipse.papyrus.uml.tools.namereferences, + org.eclipse.papyrus.uml.tools.profile.definition, + org.eclipse.papyrus.uml.tools.profile.index, + org.eclipse.papyrus.uml.tools.providers, + org.eclipse.papyrus.uml.tools.service, + org.eclipse.papyrus.uml.tools.util +Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml.validation;bundle-version="[5.0.0,6.0.0)", + org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: UML Tools +Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project index 9560df3c7f9..d384e3209c9 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.xtext.integration.core</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.xtext.integration.core</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF index 66fe8440641..d5f1712e0b9 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.xtext.integration.core
-Require-Bundle: org.eclipse.xtext;bundle-version="2.4.2"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: XText integration Core
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.xtext.integration.core +Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: XText integration Core +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project index 49c19d81dda..f10ccb864e8 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.xtext.integration.ui</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.xtext.integration.ui</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF index f413836bd16..d1102c0f444 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF @@ -1,33 +1,18 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.xtext.integration,
- org.eclipse.papyrus.uml.xtext.integration.job
-Require-Bundle: org.eclipse.gef;bundle-version="3.9.0",
- org.eclipse.core.runtime;bundle-version="3.9.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.eclipse.xtext;bundle-version="2.4.2",
- org.eclipse.xtext.ui;bundle-version="2.4.2",
- org.eclipse.ui.ide;bundle-version="3.9.0",
- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: GMF Xtext Integration
-Bundle-Activator: org.eclipse.papyrus.uml.xtext.integration.ui.Activator
-Bundle-ManifestVersion: 2
-Import-Package: org.eclipse.papyrus.infra.services.validation,
- org.eclipse.papyrus.infra.services.validation.commands,
- org.eclipse.papyrus.uml.extensionpoints.profile,
- org.eclipse.papyrus.uml.extensionpoints.standard
-Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.xtext.integration, + org.eclipse.papyrus.uml.xtext.integration.job +Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: GMF Xtext Integration +Bundle-Activator: org.eclipse.papyrus.uml.xtext.integration.ui.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.ui;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project index 1b1ff726f88..7582fbe11ce 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.xtext.integration.validation</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.xtext.integration.validation</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF index f644ecbf98f..ce8f8b71346 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF @@ -1,17 +1,11 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.xtext.integration.validation
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.emf.validation;bundle-version="1.7.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.xtext;bundle-version="2.5.1",
- org.eclipse.jface;bundle-version="3.10.0",
- org.eclipse.ui;bundle-version="3.106.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: GMF Xtext Integration Validation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.validation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.uml.xtext.integration.validation +Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: GMF Xtext Integration Validation +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.validation;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.project b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.project index fbbdbae5e78..2dc5971b2a0 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.project +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.modelexplorer.newchild</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.modelexplorer.newchild</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF index ad3a4362c61..a3d50fc7ab3 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF @@ -1,13 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0", - org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.newchild;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.project b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.project index 6529ae2f1f2..36f508805e5 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.project +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.modelexplorer.resourceloading</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.modelexplorer.resourceloading</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF index abe15ca85eb..0f85839de4c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF @@ -1,22 +1,17 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.views.modelexplorer.resourceloading.handler
-Require-Bundle: org.eclipse.emf.converter;bundle-version="2.5.0",
- org.eclipse.emf.ecore.editor;bundle-version="2.6.0",
- org.eclipse.emf.workspace.ui;bundle-version="1.3.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.resourceloading.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.resourceloading;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.views.modelexplorer.resourceloading.handler +Require-Bundle: org.eclipse.emf.converter;bundle-version="[2.7.0,3.0.0)", + org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)", + org.eclipse.emf.workspace.ui;bundle-version="[1.3.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.resourceloading.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.resourceloading;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.project b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.project index e8257602822..f682d77ad51 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.project +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.modelexplorer.widgets</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.modelexplorer.widgets</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF index 01262c66aa1..ccc529d5763 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF @@ -1,21 +1,13 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.views.modelexplorer.widgets
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.gmf.runtime.emf.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.widgets.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.widgets;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.views.modelexplorer.widgets +Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)" +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.widgets.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.widgets;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project index 66cdae4dee4..0919559be57 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project @@ -1,29 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.modelexplorer</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.papyrus.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.modelexplorer</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF index d05fcc83fec..0fd88a68871 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF @@ -11,51 +11,19 @@ Export-Package: org.eclipse.papyrus.views.modelexplorer, org.eclipse.papyrus.views.modelexplorer.matching, org.eclipse.papyrus.views.modelexplorer.preferences, org.eclipse.papyrus.views.modelexplorer.queries -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.ui.navigator;bundle-version="3.4.0", - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.emf.converter;bundle-version="2.5.0", - org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", - org.eclipse.emf.ecore.editor;bundle-version="2.6.0", - org.eclipse.emf.workspace.ui;bundle-version="1.3.0", - org.eclipse.core.expressions;bundle-version="3.4.200", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", - org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.semantic;bundle-version="1.2.0", - org.eclipse.emf.ecore, - org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0", - org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.util.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.converter;bundle-version="[2.7.0,3.0.0)", + org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)", + org.eclipse.emf.workspace.ui;bundle-version="[1.3.0,2.0.0)", + org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.services.semantic;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.navigation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/views/org.eclipse.papyrus.views.search/.project b/plugins/views/org.eclipse.papyrus.views.search/.project index 957e039a408..8f76d15482e 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/.project +++ b/plugins/views/org.eclipse.papyrus.views.search/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.search</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.search</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF index 4c0b72f2e9d..f8f00f0155e 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF +++ b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF @@ -1,30 +1,20 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.views.search.regex,
- org.eclipse.papyrus.views.search.results,
- org.eclipse.papyrus.views.search.scope,
- org.eclipse.papyrus.views.search.utils
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.core.resources;bundle-version="3.8.100",
- org.eclipse.emf.common;bundle-version="2.9.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.search;bundle-version="3.8.100",
- org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.ui.ide,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %vendorName
-Bundle-Version: 1.2.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.views.search.Activator
-Import-Package: org.eclipse.uml2.uml
-Bundle-SymbolicName: org.eclipse.papyrus.views.search;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.views.search.regex, + org.eclipse.papyrus.views.search.results, + org.eclipse.papyrus.views.search.scope, + org.eclipse.papyrus.views.search.utils +Bundle-ActivationPolicy: lazy +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", + org.eclipse.search;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.services.openelement;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport +Bundle-Vendor: %vendorName +Bundle-Version: 1.2.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.views.search.Activator +Bundle-SymbolicName: org.eclipse.papyrus.views.search;singleton:=true diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/.project b/plugins/views/properties/org.eclipse.papyrus.views.properties/.project index 45a258fc7ba..759e8b07677 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/.project +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.views.properties</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.properties</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF index 27238bba6fa..709d8001e90 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF @@ -12,17 +12,8 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.core.runtime;bundle-version="3.6.0", - org.eclipse.core.resources;bundle-version="3.6.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.emf.edit;bundle-version="2.8.0", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0";visibility:=reexport +Require-Bundle: org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport Bundle-Vendor: %Bundle-Vendor Bundle-Version: 1.2.0.qualifier Eclipse-BuddyPolicy: dependent diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/.project b/plugins/views/validation/org.eclipse.papyrus.views.validation/.project index 902318fcefa..fdbf6bfcd01 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/.project +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.main.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF index ee68b94096d..c648aa459d7 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF @@ -1,20 +1,7 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.views.validation.internal -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.papyrus.infra.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0", - org.eclipse.emf.ecore;bundle-version="2.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.emf.edit.ui;bundle-version="2.8.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", - org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", - com.google.guava;bundle-version="11.0.0", - org.eclipse.ui.ide;bundle-version="3.10.100", - org.eclipse.core.expressions;bundle-version="3.4.600", - org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", - org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0" +Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/releng/dev/site/category.xml b/releng/dev/site/category.xml index 8cebd4b27c0..da33099baa5 100644 --- a/releng/dev/site/category.xml +++ b/releng/dev/site/category.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature id="org.eclipse.papyrus.dev.feature" url="features/org.eclipse.papyrus.dev.feature_1.2.0.qualifier.jar" version="1.2.0.qualifier"> + <feature id="org.eclipse.papyrus.dev.feature" url="features/org.eclipse.papyrus.dev.feature_2.0.0.qualifier.jar" version="2.0.0.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> - <feature id="org.eclipse.papyrus.dev.feature.source" url="features/org.eclipse.papyrus.dev.feature.source_1.2.0.qualifier.jar" version="1.2.0.qualifier"> + <feature id="org.eclipse.papyrus.dev.feature.source" url="features/org.eclipse.papyrus.dev.feature.source_2.0.0.qualifier.jar" version="2.0.0.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> <category-def label="Papyrus Category" name="org.eclipse.papyrus.category"> diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml index 546106e6e46..6f5a87a9de6 100644 --- a/releng/main-tests/pom.xml +++ b/releng/main-tests/pom.xml @@ -41,6 +41,7 @@ <module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests</module> <module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests</module> <module>../../tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests</module> + <module>../../tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests</module> <module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests</module> <module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests</module> <module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests</module> diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml index d5b24c478bc..bfc9d308fc7 100644 --- a/releng/main/site/category.xml +++ b/releng/main/site/category.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/org.eclipse.papyrus.sdk.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="1.2.0.qualifier"> + <feature url="features/org.eclipse.papyrus.sdk.feature_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="2.0.0.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> - <feature url="features/org.eclipse.papyrus.sdk.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="1.2.0.qualifier"> + <feature url="features/org.eclipse.papyrus.sdk.feature.source_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="2.0.0.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> <category-def name="org.eclipse.papyrus.category" label="Papyrus"> diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml index 278e3a629f9..21e83769a1c 100644 --- a/releng/main/site/pom.xml +++ b/releng/main/site/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>org.eclipse.papyrus.p2</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> <build> diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup index fa550fff477..8ffebf34e3f 100644 --- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup +++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup @@ -31,6 +31,7 @@ <requirement name="org.eclipse.oomph.projectconfig.feature.group"/> <requirement name="org.eclipse.oomph.projectcopy.feature.group"/> <requirement name="org.eclipse.oomph.workingsets.feature.group"/> + <requirement name="org.eclipse.oomph.version.feature.group"/> <requirement name="org.sonatype.tycho.m2e.feature.feature.group"/> <repository url="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.8.0/N/LATEST/"/> </setupTask> @@ -204,7 +205,7 @@ </detail> </annotation> </repository> - <repository url="${base.downloads.url}/nattable/snapshots/484/repository/"/> + <repository url="${base.downloads.url}/nattable/snapshots/475/repository/"/> <repository url="http://download.eclipse.org/xwt/release-1.1.0"> <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> <detail key="updateFrom"> @@ -652,6 +653,8 @@ </setupTask> <setupTask xsi:type="setup.targlets:TargletTask"> <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Dependencies"> + <requirement name="org.eclipse.xtext.xbase.feature.group"/> + <requirement name="org.eclipse.emf.mwe2.launcher.feature.group"/> <repositoryList name="Neon"> <repository url="${base.downloads.url}/technology/nebula/snapshot/"/> </repositoryList> @@ -660,7 +663,7 @@ </repositoryList> </targlet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> <setupTask xsi:type="setup.targlets:TargletTask"> <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Neon Dependencies"> @@ -712,7 +715,7 @@ </predicate> </workingSet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -828,7 +831,7 @@ <setupTask xsi:type="p2_1.0:P2Task"> <requirement name="org.eclipse.xtend.sdk.feature.group"/> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -875,7 +878,7 @@ <requirement name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> </targlet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -916,7 +919,7 @@ <setupTask xsi:type="p2_1.0:P2Task"> <requirement name="org.eclipse.xtend.sdk.feature.group"/> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -976,7 +979,7 @@ </predicate> </workingSet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1013,7 +1016,7 @@ </predicate> </workingSet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1055,7 +1058,7 @@ </predicate> </workingSet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1090,7 +1093,7 @@ </predicate> </workingSet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1140,7 +1143,7 @@ <requirement name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> </targlet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1151,7 +1154,7 @@ </stream> </project> <project label="Others" name="misc"> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1218,7 +1221,7 @@ <setupTask xsi:type="projects:ProjectsImportTask"> <sourceLocator locateNestedProjects="true" rootFolder="${papyrus.git.clone.location/releng/emfgen}"/> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1226,7 +1229,7 @@ </stream> <description>Sources of Maven plug-ins for Papyrus custom build behaviours</description> </project> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1310,7 +1313,7 @@ </targlet> </setupTask> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="cdo"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1378,7 +1381,7 @@ <requirement name="org.eclipse.xtend.sdk.feature.group"/> <requirement name="org.eclipse.acceleo.feature.group"/> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1395,7 +1398,7 @@ </project> <project label="Diagram Template" name="diagramtemplate"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="diagramtemplate"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1416,7 +1419,7 @@ <setupTask xsi:type="p2_1.0:P2Task"> <requirement name="org.eclipse.xtend.sdk.feature.group"/> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1429,7 +1432,7 @@ </project> <project label="East-ADL" name="eastadl"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="eastadl"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1469,7 +1472,7 @@ </predicate> </workingSet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1508,7 +1511,7 @@ </repositoryList> </targlet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1524,7 +1527,7 @@ <setupTask xsi:type="p2_1.0:P2Task"> <requirement name="org.eclipse.xtend.sdk.feature.group"/> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1542,7 +1545,7 @@ <requirement name="org.eclipse.papyrus.umlrt"/> </targlet> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1565,7 +1568,7 @@ </project> <project label="RobotML" name="robotml"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="robotml"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1579,7 +1582,7 @@ <project label="Table Migration" name="tablemigration"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="tablemigration"/> <setupTask xsi:type="setup:VariableTask" name="papyrus.extrafeature" value="tablemigration"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1593,7 +1596,7 @@ <project label="UML Compare" name="umlcompare"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="uml/compare"/> <setupTask xsi:type="setup:VariableTask" name="papyrus.extrafeature" value="extra.uml.compare"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1607,7 +1610,7 @@ <project label="UML Export" name="umlexport"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="uml/org.eclipse.papyrus.uml.export"/> <setupTask xsi:type="setup:VariableTask" name="papyrus.extrafeature" value="uml.export"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1620,7 +1623,7 @@ </project> <project label="UML-RT" name="umlrt"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="umlrt"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1643,7 +1646,7 @@ </project> <project label="BPMN" name="bpmn"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="bpmn"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1653,7 +1656,7 @@ </project> <project label="Manufacturing" name="manufacturing"> <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="manufacturing"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <description>Papyrus4Manufacturing</description> @@ -1700,7 +1703,7 @@ </setupTask> <project label="Oomph Setup" name="Oomph"> <setupTask xsi:type="setup:EclipseIniTask" option="-Doomph.redirection.papyrussetups" value="=http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/->${papyrus.git.clone.location|uri}/releng/org.eclipse.papyrus.oomph/setups/" vm="true"/> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1726,7 +1729,7 @@ <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.releng\.tools"/> </sourceLocator> </setupTask> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1735,7 +1738,7 @@ <description>Release engineering tools, including the POM and Oomph Setup dependencies updater actions.</description> </project> <project label="Developer Tools" name="devtools"> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> <setupTask xsi:type="p2_1.0:P2Task"> <requirement name="org.eclipse.papyrus.dev.feature.feature.group"/> @@ -1778,7 +1781,7 @@ </stream> <description>Installs developer tools, including the code generator for Papyrus diagram plug-ins and various debugging aids such as "spy" views. Source code is not included.</description> </project> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> </stream> <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance"> @@ -1789,7 +1792,7 @@ </stream> <description>Sources and tools required for working on the Papyrus developer tools (not part of the product). Does not install the developer tools in your IDE: use the Developer Tools sub-project for that.</description> </project> - <stream label="master (Neon/1.2)" name="master"> + <stream label="master (Neon/2.0)" name="master"> <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> <setupTask xsi:type="jdt:JRETask" version="JavaSE-1.8" location="${jre.location-1.8}"/> <setupTask xsi:type="setup.targlets:TargletTask"> diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project index a327e6f8d25..29b1707ed8d 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project +++ b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/.project @@ -30,11 +30,29 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/META-INF/MANIFEST.MF b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/META-INF/MANIFEST.MF index 0fdca9c0dbc..36db7b63539 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.annotations/META-INF/MANIFEST.MF +++ b/tests/framework/org.eclipse.papyrus.tests.framework.annotations/META-INF/MANIFEST.MF @@ -1,14 +1,13 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.xtend.lib.macro;bundle-version="2.8.1",
- org.eclipse.xtend.lib;bundle-version="2.8.1",
- com.google.inject;bundle-version="3.0.0"
-Export-Package: org.eclipse.papyrus.tests.framework.xtend.annotations
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.tests.framework.annotations;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + com.google.inject;bundle-version="[3.0.0,4.0.0)" +Export-Package: org.eclipse.papyrus.tests.framework.xtend.annotations +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.tests.framework.annotations;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.edit/.project b/tests/framework/org.eclipse.papyrus.tests.framework.edit/.project index a2e2a634656..dcd3c1c77ab 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.edit/.project +++ b/tests/framework/org.eclipse.papyrus.tests.framework.edit/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.edit/META-INF/MANIFEST.MF b/tests/framework/org.eclipse.papyrus.tests.framework.edit/META-INF/MANIFEST.MF index 3c02a1256a7..f91a3b8cba5 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.edit/META-INF/MANIFEST.MF +++ b/tests/framework/org.eclipse.papyrus.tests.framework.edit/META-INF/MANIFEST.MF @@ -1,25 +1,17 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.tests.framework.exceptions.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.tests.framework;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.gmf.codegen;visibility:=reexport,
- org.eclipse.gmf.codegen.edit;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.emf.codegen.ecore;visibility:=reexport,
- org.eclipse.emf.codegen.ecore.ui;visibility:=reexport,
- org.eclipse.uml2.common.edit;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.tests.framework.exceptions.provider.TestexceptionsEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.tests.framework.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.tests.framework.exceptions.provider +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.codegen.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport, + org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.tests.framework.exceptions.provider.TestexceptionsEditPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.tests.framework.edit;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.editor/.project b/tests/framework/org.eclipse.papyrus.tests.framework.editor/.project index 01464f8bf32..5d56add7ad2 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.editor/.project +++ b/tests/framework/org.eclipse.papyrus.tests.framework.editor/.project @@ -20,9 +20,27 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.editor/META-INF/MANIFEST.MF b/tests/framework/org.eclipse.papyrus.tests.framework.editor/META-INF/MANIFEST.MF index c7ff54ce67c..3096832f6ec 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.editor/META-INF/MANIFEST.MF +++ b/tests/framework/org.eclipse.papyrus.tests.framework.editor/META-INF/MANIFEST.MF @@ -1,22 +1,14 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.tests.framework.exceptions.presentation
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.tests.framework.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.gmf.codegen.edit;visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.emf.codegen.ecore.ui;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.tests.framework.exceptions.presentation.TestexceptionsEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.tests.framework.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.tests.framework.exceptions.presentation +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.papyrus.tests.framework.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.tests.framework.exceptions.presentation.TestexceptionsEditorPlugin$Implementation +Bundle-SymbolicName: org.eclipse.papyrus.tests.framework.editor;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/.project b/tests/framework/org.eclipse.papyrus.tests.framework/.project index b2430ca6e06..4577b8797a3 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework/.project +++ b/tests/framework/org.eclipse.papyrus.tests.framework/.project @@ -30,11 +30,29 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> </natures> </projectDescription> diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF b/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF index d615c6e1f04..1c535b594b1 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF +++ b/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF @@ -1,54 +1,43 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.tests.framework,
- org.eclipse.papyrus.tests.framework.exceptions,
- org.eclipse.papyrus.tests.framework.exceptions.impl,
- org.eclipse.papyrus.tests.framework.exceptions.util,
- org.eclipse.papyrus.tests.framework.gmfgen2uml,
- org.eclipse.papyrus.tests.framework.gmfgenuml2utp,
- org.eclipse.papyrus.tests.framework.internal.exceptions.operations,
- org.eclipse.papyrus.tests.framework.m2m,
- org.eclipse.papyrus.tests.framework.m2t.xtend,
- org.eclipse.papyrus.tests.framework.m2t.xtend.templates,
- org.eclipse.papyrus.tests.framework.mwe
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.junit;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.emf.codegen.ecore;visibility:=reexport,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.gmf.codegen;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.xtend;bundle-version="1.0.0",
- org.eclipse.xtend.lib;bundle-version="2.8.3",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib,
- org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
- org.eclipse.emf.mwe.utils;visibility:=reexport,
- org.eclipse.emf.mwe2.runtime;visibility:=reexport,
- org.apache.commons.logging;visibility:=reexport,
- org.eclipse.emf.mwe2.lib;bundle-version="2.5.0";visibility:=reexport,
- org.eclipse.uml2.codegen.ecore;bundle-version="1.10.0";visibility:=reexport,
- org.eclipse.papyrus.gmfgenextension;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.emf.ecore.editor;bundle-version="2.10.0";visibility:=reexport,
- org.eclipse.papyrus.mwe2.utils;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.core.resources,
- org.eclipse.gmf.validate;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.uml.resources;bundle-version="5.1.0",
- org.eclipse.upr.utp;bundle-version="0.9.0",
- org.eclipse.papyrus.tests.framework.annotations;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
- com.google.inject;bundle-version="3.0.0";visibility:=reexport,
- org.eclipse.xtext.util;bundle-version="2.9.0"
-Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.tests.framework.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.tests.framework;singleton:=true
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.tests.framework, + org.eclipse.papyrus.tests.framework.exceptions, + org.eclipse.papyrus.tests.framework.exceptions.impl, + org.eclipse.papyrus.tests.framework.exceptions.util, + org.eclipse.papyrus.tests.framework.gmfgen2uml, + org.eclipse.papyrus.tests.framework.gmfgenuml2utp, + org.eclipse.papyrus.tests.framework.internal.exceptions.operations, + org.eclipse.papyrus.tests.framework.m2m, + org.eclipse.papyrus.tests.framework.m2t.xtend, + org.eclipse.papyrus.tests.framework.m2t.xtend.templates, + org.eclipse.papyrus.tests.framework.mwe +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)", + org.eclipse.xtend;bundle-version="[2.2.0,3.0.0)", + org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.mwe2.lib;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.gmfgenextension;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.emf;bundle-version="[2.6.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.mwe2.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.gmf.validate;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.resources;bundle-version="[5.2.0,6.0.0)", + org.eclipse.upr.utp;bundle-version="[0.9.0,1.0.0)", + org.eclipse.papyrus.tests.framework.annotations;bundle-version="[1.2.0,2.0.0)", + org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)", + com.google.inject;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)" +Bundle-Vendor: %providerName +Eclipse-LazyStart: true +Bundle-Version: 1.2.0.qualifier +Bundle-Activator: org.eclipse.papyrus.tests.framework.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.tests.framework;singleton:=true diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF index b6821d5e8f0..c9a5ddec8ec 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF @@ -1,15 +1,16 @@ -Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
- org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,
- org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query,
- org.eclipse.papyrus.infra.core.sasheditor.di.tests
-Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0"
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests
-Import-Package: org.eclipse.papyrus.infra.core.sasheditor.pagesmodel
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)" +Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider, + org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal, + org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query, + org.eclipse.papyrus.infra.core.sasheditor.di.tests +Bundle-Vendor: %Bundle-Vendor +Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0" +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests +Import-Package: org.eclipse.papyrus.infra.core.sasheditor.pagesmodel +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF index b5719b121b8..8055401609e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF @@ -91,7 +91,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.types.ui.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.extendedtypes.ui.tests;bundle-version="1.2.0", org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="1.2.0", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0" + org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0", + org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="2.0.0" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java index ea04f97cb75..548c29b22a8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java @@ -71,6 +71,9 @@ public class AllTests { suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class)); suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class)); + /* customization */ + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.eclipse.project.editors.tests.AllTests.class)); + /* views */ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class)); suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.customization.properties.tests.AllTests.class)); diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.classpath b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.classpath index b1dabee3829..eca7bdba8f0 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.classpath +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.classpath @@ -1,7 +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/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.project b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.project index 1416be55d88..36e685ee68b 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.project +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.project @@ -1,28 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.bundles.tests</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.bundles.tests</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.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.settings/org.eclipse.jdt.core.prefs index 9ca8e68231b..b3aa6d60f94 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,291 +1,291 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF index 98a12825b43..bf1cebb30a4 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF @@ -1,21 +1,21 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.pde.runtime,
- org.eclipse.ui.ide,
- org.eclipse.pde;bundle-version="3.7.0",
- org.eclipse.pde.core,
- org.eclipse.update.configurator,
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.bundles.tests
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)", + org.eclipse.update.configurator;bundle-version="[3.3.0,4.0.0)", + org.junit;bundle-version="[4.12.0,5.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.junit.utils;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.bundles.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java index 4737712278b..7fd8737feda 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java @@ -1,101 +1,116 @@ -package org.eclipse.papyrus.bundles.tests;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.feature.Feature;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-public class BundleTestsUtils {
-
- // This version number should be changed at each release
- public static final String PAPYRUS_VERSION = "1.2.0"; //$NON-NLS-1$
-
- public static final String INCUBATION = "(Incubation)"; //$NON-NLS-1$
-
- public static final String VENDOR_NAME = "Eclipse Modeling Project"; //$NON-NLS-1$
-
- public static final String BUNDLE_NAME = "Bundle-Name"; //$NON-NLS-1$
-
- public static final String BUNDLE_VENDOR = "Bundle-Vendor"; //$NON-NLS-1$
-
- public static final String BUNDLE_VERSION = "Bundle-Version"; //$NON-NLS-1$
-
- public static final String PAPYRUS_PREFIX = "org.eclipse.papyrus."; //$NON-NLS-1$
-
- public static final String BUNDLE_REQUIREDEXECUTIONENVIRONMENT = "Bundle-RequiredExecutionEnvironment"; //$NON-NLS-1$
-
- public static final String BUNDLE_IMPORT_PACKAGE = "Import-Package"; //$NON-NLS-1$
-
- public static final String JAVA_VERSION_5 = "J2SE-1.5"; //$NON-NLS-1$
-
- public static final String JAVA_VERSION_6 = "JavaSE-1.6"; //$NON-NLS-1$
-
- public static final String JAVA_VERSION_7 = "JavaSE-1.7"; //$NON-NLS-1$
-
- public static final String JAVA_VERSION_8 = "JavaSE-1.8"; //$NON-NLS-1$
-
- public static final String JAVA_VERSION_REGEX = JAVA_VERSION_5 + "|" + JAVA_VERSION_6 + "|" + JAVA_VERSION_7 + "|" + JAVA_VERSION_8;
-
- public static final String REQUIRE_BUNDLE = "Require-Bundle"; //$NON-NLS-1$
-
- private BundleTestsUtils() {
- // to prevent instanciation
- }
-
- /**
- *
- * @return the Bundle with a name beginning by {@link #PAPYRUS_PREFIX}
- */
- public static List<Bundle> getPapyrusBundles() {
- final List<Bundle> papyrusBundle = new ArrayList<Bundle>();
- BundleContext context = InternalPlatform.getDefault().getBundleContext();
- org.osgi.framework.Bundle[] bundles = context.getBundles();
- for (int i = 0; i < bundles.length; i++) {
- String currentName = bundles[i].getSymbolicName();
- if (currentName.startsWith(PAPYRUS_PREFIX)) {
- papyrusBundle.add(bundles[i]);
- }
- }
-
- return papyrusBundle;
- }
-
- /**
- *
- * @param bundle
- * a bundle
- * @return
- * <code>true</code> if the bundle represents a Java Project
- */
- public static boolean isJavaProject(final Bundle bundle) {
- // we are looking for folders "org/eclipse/papyrus" that contains classes. If not, it is not a Java project
- URL res = bundle.getResource("org/eclipse/papyrus"); //$NON-NLS-1$
- return res != null;
- }
-
- /**
- *
- * @return
- * the list of the Papyrus features
- */
- public static List<Feature> getPapyrusFeature() {
- final List<Feature> features = new ArrayList<Feature>();
- org.eclipse.pde.internal.core.FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager();
- IFeatureModel[] models2 = manager.getModels();
- for (IFeatureModel iFeatureModel : models2) {
- final IFeature feature = iFeatureModel.getFeature();
- final String id = feature.getId();
- if (id.startsWith(PAPYRUS_PREFIX)) {
- features.add((Feature) feature);
- }
- }
- return features;
- }
-}
+/***************************************************************************** + * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, 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: + * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation + * Christian W. Damus - bug 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.bundles.tests; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.eclipse.core.internal.runtime.InternalPlatform; +import org.eclipse.pde.internal.core.PDECore; +import org.eclipse.pde.internal.core.feature.Feature; +import org.eclipse.pde.internal.core.ifeature.IFeature; +import org.eclipse.pde.internal.core.ifeature.IFeatureModel; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; + +public class BundleTestsUtils { + + public static final String INCUBATION = "(Incubation)"; //$NON-NLS-1$ + + public static final String VENDOR_NAME = "Eclipse Modeling Project"; //$NON-NLS-1$ + + public static final String BUNDLE_NAME = "Bundle-Name"; //$NON-NLS-1$ + + public static final String BUNDLE_VENDOR = "Bundle-Vendor"; //$NON-NLS-1$ + + public static final String BUNDLE_VERSION = "Bundle-Version"; //$NON-NLS-1$ + + public static final String PAPYRUS_PREFIX = "org.eclipse.papyrus."; //$NON-NLS-1$ + + public static final String BUNDLE_REQUIREDEXECUTIONENVIRONMENT = "Bundle-RequiredExecutionEnvironment"; //$NON-NLS-1$ + + public static final String BUNDLE_IMPORT_PACKAGE = "Import-Package"; //$NON-NLS-1$ + + public static final String JAVA_VERSION_5 = "J2SE-1.5"; //$NON-NLS-1$ + + public static final String JAVA_VERSION_6 = "JavaSE-1.6"; //$NON-NLS-1$ + + public static final String JAVA_VERSION_7 = "JavaSE-1.7"; //$NON-NLS-1$ + + public static final String JAVA_VERSION_8 = "JavaSE-1.8"; //$NON-NLS-1$ + + public static final String JAVA_VERSION_REGEX = Stream.of(JAVA_VERSION_5, JAVA_VERSION_6, JAVA_VERSION_7, JAVA_VERSION_8) + .map(Pattern::quote) + .collect(Collectors.joining("|")); //$NON-NLS-1$ + + public static final String REQUIRE_BUNDLE = "Require-Bundle"; //$NON-NLS-1$ + + private BundleTestsUtils() { + // to prevent instanciation + } + + /** + * + * @return the Bundle with a name beginning by {@link #PAPYRUS_PREFIX} + */ + public static List<Bundle> getPapyrusBundles() { + final List<Bundle> papyrusBundle = new ArrayList<Bundle>(); + BundleContext context = InternalPlatform.getDefault().getBundleContext(); + org.osgi.framework.Bundle[] bundles = context.getBundles(); + for (int i = 0; i < bundles.length; i++) { + String currentName = bundles[i].getSymbolicName(); + if (currentName.startsWith(PAPYRUS_PREFIX)) { + papyrusBundle.add(bundles[i]); + } + } + + return papyrusBundle; + } + + /** + * + * @param bundle + * a bundle + * @return + * <code>true</code> if the bundle represents a Java Project + */ + public static boolean isJavaProject(final Bundle bundle) { + // we are looking for folders "org/eclipse/papyrus" that contains classes. If not, it is not a Java project + URL res = bundle.getResource("org/eclipse/papyrus"); //$NON-NLS-1$ + return res != null; + } + + /** + * + * @return + * the list of the Papyrus features + */ + public static List<Feature> getPapyrusFeature() { + final List<Feature> features = new ArrayList<Feature>(); + org.eclipse.pde.internal.core.FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager(); + IFeatureModel[] models2 = manager.getModels(); + for (IFeatureModel iFeatureModel : models2) { + final IFeature feature = iFeatureModel.getFeature(); + final String id = feature.getId(); + if (id.startsWith(PAPYRUS_PREFIX)) { + features.add((Feature) feature); + } + } + return features; + } +} diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java index 42900676ac5..7666f7e41af 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others. - * + * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -10,7 +9,7 @@ * Contributors: * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation * Christian W. Damus - Skip the feature-version test when running in development mode - * Christian W. Damus - bug 433206 + * Christian W. Damus - bugs 433206, 485220 * *****************************************************************************/ package org.eclipse.papyrus.bundles.tests; @@ -19,7 +18,6 @@ import java.lang.reflect.Field; import java.net.URL; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -27,10 +25,8 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.junit.framework.classification.InvalidTest; import org.eclipse.papyrus.junit.framework.classification.NotImplemented; import org.eclipse.papyrus.junit.framework.classification.rules.Condition; -import org.eclipse.papyrus.junit.framework.classification.rules.Conditional; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.JUnitUtils; -import org.eclipse.pde.internal.core.feature.Feature; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.junit.Assert; @@ -45,10 +41,6 @@ import org.osgi.framework.Bundle; */ public class BundlesTests extends AbstractPapyrusTest { - // Transform the version number to the regex format - // Adds .* (Valid version numbers are e.g. 0.10.1.qualifier) - private static final String REGEX_VERSION_NUMBER = BundleTestsUtils.PAPYRUS_VERSION.replaceAll("\\.", "\\\\.") + "\\..*"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - // Indicates that the bundle name must contain the (Incubation) string // private static final String REGEX_INCUBATION = ".*\\(Incubation\\)"; //$NON-NLS-1$ @@ -60,32 +52,9 @@ public class BundlesTests extends AbstractPapyrusTest { private static final String GLAZED_LIST_VERSION = "1.9.0";//$NON-NLS-1$ - private static final String PAPYRUS_VERSION = BundleTestsUtils.PAPYRUS_VERSION; - @Condition public final boolean isAutomatedBuild = JUnitUtils.isAutomatedBuildExecution(); - @Test - @Conditional(key = "isAutomatedBuild") - public void featureVersionNumberTest() { - StringBuffer message = new StringBuffer("Wrong version number for the features:"); //$NON-NLS-1$ - int nbProblem = 0; - final List<Feature> features = BundleTestsUtils.getPapyrusFeature(); - for (final Feature feature : features) { - String version = feature.getVersion(); - if (!version.matches(REGEX_VERSION_NUMBER)) { - message.append("\n"); //$NON-NLS-1$ - message.append(feature.getId()); - nbProblem++; - } - } - StringBuffer errorMessage = new StringBuffer(); - errorMessage.append(nbProblem); - errorMessage.append("problems!\n");//$NON-NLS-1$ - errorMessage.append(message.toString()); - Assert.assertTrue(errorMessage.toString(), nbProblem == 0); - } - /** * Tests that all Papyrus Bundle name are finished by {@link #INCUBATION} */ @@ -117,15 +86,6 @@ public class BundlesTests extends AbstractPapyrusTest { } /** - * Tests that each papyrus plugins have the correct version - */ - @InvalidTest("FIXME: add exceptions for incubating extra plug-ins, which have a different version") - @Test - public void versionTest() { - testManifestProperty(BundleTestsUtils.BUNDLE_VERSION, REGEX_VERSION_NUMBER, false, false); - } - - /** * Tests if the file about.html is included to the plugin */ @Test @@ -151,46 +111,6 @@ public class BundlesTests extends AbstractPapyrusTest { } /** - * This test verify that we doesn't re-export dependencies - */ - @NotImplemented("Usage of reexported dependencies is discouraged") - @Test - public void reexportDependencies() { - StringBuffer message = new StringBuffer(); - int nb = 0; - for (final Bundle current : BundleTestsUtils.getPapyrusBundles()) { - final String value = current.getHeaders().get(BundleTestsUtils.REQUIRE_BUNDLE); - if (value == null) { - continue; - } - final String[] bundles = value.split(","); //$NON-NLS-1$ - StringBuffer localMessage = new StringBuffer(); - for (final String bundle : bundles) { - if (bundle.contains("visibility:=reexport")) { //$NON-NLS-1$ - nb++; - if (localMessage.length() == 0) { - localMessage.append(NLS.bind("{0} re-exports:", current.getSymbolicName())); //$NON-NLS-1$ - } - if (bundle.contains(";")) { //$NON-NLS-1$ - localMessage.append(NLS.bind("\n - {0}", bundle.substring(0, bundle.indexOf(";")))); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - localMessage.append(NLS.bind("\n - {0}", bundle)); //$NON-NLS-1$ - } - } - } - if (localMessage.length() != 0) { - message.append(localMessage); - message.append("\n");//$NON-NLS-1$ - } - } - StringBuffer errorMessage = new StringBuffer(); - errorMessage.append(nb); - errorMessage.append(" problems!");//$NON-NLS-1$ - errorMessage.append(message); - Assert.assertTrue(errorMessage.toString(), nb == 0); - } - - /** * Tests if a the value of a property in the Manifest is correct * * @param property @@ -277,16 +197,6 @@ public class BundlesTests extends AbstractPapyrusTest { } /** - * We want that all Papyrus dependencies in the Papyrus plugin will be - * define - */ - @InvalidTest("FIXME: add exceptions for incubating extra plug-ins, which have a different version") - @Test - public void papyrusDependencyVersionTest() { - testPapyrusDependencies2("org.eclipse.papyrus", PAPYRUS_VERSION);//$NON-NLS-1$ - } - - /** * We want that all Papyrus batik dependencies will be defines */ @Test @@ -396,7 +306,7 @@ public class BundlesTests extends AbstractPapyrusTest { * @param first * @param second * @return - * <ul> + * <ul> * <li>0 when they are equal</li> * <li>1 if first is greater than second</li> * <li>-1 if first is smaller than second</li> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.classpath b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.classpath new file mode 100644 index 00000000000..eca7bdba8f0 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.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/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.project b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.project new file mode 100644 index 00000000000..81a9616c828 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.eclipse.project.editors.tests</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/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..b3aa6d60f94 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,291 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..954281dbc31 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..61b73b1756b --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: Papyrus Project Editor Tests +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/about.html b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/about.html new file mode 100644 index 00000000000..d35d5aed64c --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties new file mode 100644 index 00000000000..74ebb5f9be9 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties @@ -0,0 +1,18 @@ +# +# Copyright (c) 2016 Christian W. Damus 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: +# Christian W. Damus - Initial API and implementation +# +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + about.html,\ + resources/ +src.includes = about.html diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/org.eclipse.papyrus.eclipse.project.editors.tests.launch b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/org.eclipse.papyrus.eclipse.project.editors.tests.launch new file mode 100644 index 00000000000..2f5e94215cc --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/org.eclipse.papyrus.eclipse.project.editors.tests.launch @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS"> +<listEntry value="=org.eclipse.papyrus.eclipse.project.editors/src"/> +</listAttribute> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.eclipse.project.editors.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.eclipse.project.editors.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4086m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml new file mode 100644 index 00000000000..1adc7c826d0 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.tests.releng</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../../../../../releng/main-tests</relativePath> + </parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.eclipse.project.editors.tests</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/feature_project/feature.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/feature_project/feature.xml new file mode 100644 index 00000000000..01d329d5fbd --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/feature_project/feature.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<feature id="org.eclipse.papyrus.extra.umlrt.feature" label="Papyrus RT" provider-name="Papyrus Project" version="1.2.0.qualifier"> + + <copyright url="http://www.eclipse.org/legal/epl-v10.html"> + Copyright (c) 2013 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 + </copyright> + + <license url="http://localhost/license.html"> + %license + </license> + + <description url="http://localhost/description.html"> + The Papyrus implementation of UML for Real-Time and embedded systems. + </description> + + <plugin download-size="0" id="org.eclipse.papyrus.umlrt" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.umlrt.properties" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.umlrt.validation" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.umlrt.wizard" install-size="0" unpack="false" version="0.0.0"/> + + <plugin download-size="0" id="org.eclipse.papyrus.umlrt.ui" install-size="0" unpack="false" version="0.0.0"/> + +</feature>
\ No newline at end of file diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..0ab3387c0db --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF @@ -0,0 +1,23 @@ +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)", + org.eclipse.ui;bundle-version="3.6.0";resolution:=optional, + com.google.guava;bundle-version="15.0.0", + org.eclipse.core.resources;visibility:=reexport +Import-Package: com.ibm.icu.text;resolution:=optional, + org.eclipse.emf.ecore;version="2.10.0" +Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests;x-internal:=true, + org.eclipse.papyrus.foo.tests;version="2.0.0" +Bundle-Vendor: Papyrus Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: Papyrus Test Bundle +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.foo +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + +Name: author-info +Full-Name: Christian W. Damus +Company: independent +Committer: true diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/platform_feature/feature.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/platform_feature/feature.xml new file mode 100644 index 00000000000..7f1a5ea2375 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/platform_feature/feature.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.papyrus.extra.umlrt.feature" + label="Papyrus RT" + version="1.2.0.qualifier" + provider-name="Papyrus Project" + os="macosx" + ws="cocoa,carbon" + nl="en_CA" + arch="x86_64,ppc"> + + <description url="http://localhost/description.html"> + The Papyrus implementation of UML for Real-Time and embedded systems. + </description> + + <copyright url="http://www.eclipse.org/legal/epl-v10.html"> + Copyright (c) 2013 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 + </copyright> + + <license url="http://localhost/license.html"> + %license + </license> + + <plugin + id="org.eclipse.papyrus.umlrt" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.umlrt.properties" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.umlrt.validation" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.umlrt.wizard" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.umlrt.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/simple_project/hello.txt b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/simple_project/hello.txt new file mode 100644 index 00000000000..af5626b4a11 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/simple_project/hello.txt @@ -0,0 +1 @@ +Hello, world! diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/AllTests.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/AllTests.java new file mode 100644 index 00000000000..a5c8780ff56 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/AllTests.java @@ -0,0 +1,36 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.eclipse.papyrus.junit.framework.runner.Headless; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + + +/** + * Project Editors plug-in test suite. + */ +@Headless +@RunWith(ClassificationSuite.class) +@SuiteClasses({ + ProjectEditorTest.class, + PluginProjectEditorTest.class, + JavaProjectEditorTest.class, + ManifestEditorTest.class, + PluginEditorTest.class, + FeatureProjectEditorTest.class, +}) +public class AllTests { + // Nothing more +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/CreatedProject.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/CreatedProject.java new file mode 100644 index 00000000000..afe24674fed --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/CreatedProject.java @@ -0,0 +1,34 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor; + +/** + * Annotation for test cases that should be run on a project that is already + * {@link IProjectEditor#create() created}. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface CreatedProject { + /** + * Whether the project should be created (default is {@code true}). + */ + boolean value() default true; +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/FeatureProjectEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/FeatureProjectEditorTest.java new file mode 100644 index 00000000000..596abc8519b --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/FeatureProjectEditorTest.java @@ -0,0 +1,373 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import static org.hamcrest.CoreMatchers.anything; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeThat; + +import java.util.Collections; +import java.util.Objects; +import java.util.Optional; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IFeatureProjectEditor; +import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +/** + * Test cases for the implementation of the {@link IFeatureProjectEditor} API. + */ +@RunWith(ClassificationRunner.class) +public class FeatureProjectEditorTest { + + @Rule + public final ProjectEditorFixture<? extends IFeatureProjectEditor> fixture = new ProjectEditorFixture<>(IFeatureProjectEditor.class); + + @MissingFiles + @Test + public void getMissingFiles() { + assertThat(fixture.getEditor().getMissingFiles(), hasItem("feature.xml")); + } + + @CreatedProject(false) + @Test + public void getMissingNature() { + assertThat(fixture.getEditor().getMissingNature(), hasItem("org.eclipse.pde.FeatureNature")); + fixture.getEditor().create(); + fixture.getEditor().save(); + assertThat(fixture.getEditor().getMissingNature(), not(hasItem(anything()))); + + // And it's in the file + assertThat(fixture.slurp(".project"), hasItem(containsString("org.eclipse.pde.FeatureNature"))); + } + + @CreatedProject(false) + @Test + public void getMissingBuildCommand() { + assertThat(fixture.getEditor().getMissingBuildCommand(), hasItem("org.eclipse.pde.FeatureBuilder")); + fixture.getEditor().create(); + fixture.getEditor().save(); + assertThat(fixture.getEditor().getMissingBuildCommand(), not(hasItem(anything()))); + + // And it's in the file + assertThat(fixture.slurp(".project"), hasItem(containsString("org.eclipse.pde.FeatureBuilder"))); + } + + @MissingFiles + @Test + public void createFiles() { + assumeThat(fixture.getProject().getFile("feature.xml").isAccessible(), is(false)); + fixture.getEditor().createFiles(Collections.singleton("feature.xml")); + + Element manifest = getManifest(); + assertThat(manifest.getAttributes().getLength(), is(0)); + assertThat(manifest.getTextContent().trim(), is("")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getId() { + assertThat(fixture.getEditor().getId(), is("org.eclipse.papyrus.extra.umlrt.feature")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getLabel() { + assertThat(fixture.getEditor().getLabel(), is("Papyrus RT")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getVersion() { + assertThat(fixture.getEditor().getVersion(), is("1.2.0.qualifier")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getProviderName() { + assertThat(fixture.getEditor().getProviderName(), is("Papyrus Project")); + } + + @WithResource("platform_feature/feature.xml") + @Test + public void getOS() { + assertThat(fixture.getEditor().getOS(), is("macosx")); + } + + @WithResource("platform_feature/feature.xml") + @Test + public void getWS() { + assertThat(fixture.getEditor().getWS(), is("cocoa,carbon")); + } + + @WithResource("platform_feature/feature.xml") + @Test + public void getNL() { + assertThat(fixture.getEditor().getNL(), is("en_CA")); + } + + @WithResource("platform_feature/feature.xml") + @Test + public void getArch() { + assertThat(fixture.getEditor().getArch(), is("x86_64,ppc")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getDescriptionText() { + assertThat(fixture.getEditor().getDescriptionText(), containsString("UML for Real-Time")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getDescriptionURL() { + assertThat(fixture.getEditor().getDescriptionURL(), is("http://localhost/description.html")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getCopyrightText() { + assertThat(fixture.getEditor().getCopyrightText(), containsString("2013 CEA LIST")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getCopyrightURL() { + assertThat(fixture.getEditor().getCopyrightURL(), is("http://www.eclipse.org/legal/epl-v10.html")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getLicenseText() { + assertThat(fixture.getEditor().getLicenseText(), containsString("%license")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void getLicenseURL() { + assertThat(fixture.getEditor().getLicenseURL(), is("http://localhost/license.html")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setId() { + testRootAttribute("id", IFeatureProjectEditor::setId, "org.eclipse.foo"); + } + + void testRootAttribute(String name, BiConsumer<IFeatureProjectEditor, String> setter, String value) { + setter.accept(fixture.getEditor(), value); + fixture.getEditor().save(); + + assertThat(getManifest().getAttribute(name), is(value)); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setLabel() { + testRootAttribute("label", IFeatureProjectEditor::setLabel, "Foo Feature"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setVersion() { + testRootAttribute("version", IFeatureProjectEditor::setVersion, "0.1.0.qualifier"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setProviderName() { + testRootAttribute("provider-name", IFeatureProjectEditor::setProviderName, "Me, myself"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setOS() { + testRootAttribute("os", IFeatureProjectEditor::setOS, "macosx"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setWS() { + testRootAttribute("ws", IFeatureProjectEditor::setWS, "cocoa"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setNL() { + testRootAttribute("nl", IFeatureProjectEditor::setNL, "en_CA"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setArch() { + testRootAttribute("arch", IFeatureProjectEditor::setArch, "x86_64"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setDescription() { + testDescriptionoid("description", IFeatureProjectEditor::setDescription, + "http:///newdescription.html", "New description"); + } + + void testDescriptionoid(String name, TriConsumer<IFeatureProjectEditor, String, String> setter, String url, String text) { + setter.accept(fixture.getEditor(), url, text); + fixture.getEditor().save(); + + Element description = findElement(getManifest(), name).get(); + assertThat(description.getAttribute("url"), is(url)); + assertThat(description.getTextContent(), is(text)); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setCopyright() { + testDescriptionoid("copyright", IFeatureProjectEditor::setCopyright, + "http:///newcopy.html", "Copyright (c) 2016 Me"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setLicense() { + testDescriptionoid("license", IFeatureProjectEditor::setLicense, + "http:///newlic.html", "Free for all!"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void setUpdateURL() { + fixture.getEditor().setUpdateURL("Get stuff here", "http:///update"); + fixture.getEditor().save(); + + Element url = findElement(getManifest(), "url").get(); + Element discovery = findElement(url, "update").get(); + + assertThat(discovery.getAttribute("label"), is("Get stuff here")); + assertThat(discovery.getAttribute("url"), is("http:///update")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void addPlugin() { + fixture.getEditor().addPlugin("org.eclipse.foo"); + fixture.getEditor().save(); + + Element plugin = oneElement(getManifest(), "plugin", "id", "org.eclipse.foo"); + assertThat(plugin.getAttribute("version"), is("0.0.0")); + assertThat(plugin.getAttribute("download-size"), is("0")); + assertThat(plugin.getAttribute("install-size"), is("0")); + assertThat(plugin.getAttribute("unpack"), is("false")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void addRequiredFeature() { + fixture.getEditor().addRequiredFeature("org.eclipse.foo.feature", "0.7.0"); + fixture.getEditor().save(); + + Element requires = findElement(getManifest(), "requires").get(); + Element feature = oneElement(requires, "import", "feature", "org.eclipse.foo.feature"); + assertThat(feature.getAttribute("version"), is("0.7.0")); + } + + @WithResource("feature_project/feature.xml") + @Test + public void addRequiredPlugin() { + fixture.getEditor().addRequiredPlugin("org.eclipse.foo"); + fixture.getEditor().save(); + + Element requires = findElement(getManifest(), "requires").get(); + oneElement(requires, "import", "plugin", "org.eclipse.foo"); + } + + @WithResource("feature_project/feature.xml") + @Test + public void addInclude() { + fixture.getEditor().addInclude("org.eclipse.foo.feature", "0.7.0"); + fixture.getEditor().addInclude("org.eclipse.bar.feature", null); + fixture.getEditor().save(); + + Element feature = oneElement(getManifest(), "includes", "id", "org.eclipse.bar.feature"); + assertThat(feature.getAttribute("version"), is("0.0.0")); + } + + // + // Test framework + // + + Element getManifest() { + try { + DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + return builder.parse(fixture.getURI("feature.xml").toString()).getDocumentElement(); + } catch (Exception e) { + e.printStackTrace(); + fail("Failed to parse feature.xml: " + e.getMessage()); + return null; // unreachable + } + } + + Optional<Element> findElement(Element root, String name) { + return allOf(root) + .filter(element -> element.getNodeName().equals(name)) + .findFirst(); + } + + /** + * Obtains a stream over the depth-first element tree of the given {@code root}. + * + * @param root + * the root of a tree to traverse + * + * @return the elements of {@code root}, starting with it + */ + Stream<Element> allOf(Element root) { + return Stream.concat( + Stream.of(root), + childrenOf(root).flatMap(this::allOf)); + } + + Stream<Element> childrenOf(Element element) { + NodeList children = element.getChildNodes(); + return IntStream.range(0, children.getLength()) + .mapToObj(children::item) + .filter(Element.class::isInstance) + .map(Element.class::cast); + } + + Element oneElement(Element root, String name, String attribute, String value) { + int[] count = { 0 }; + return allOf(root) + .filter(e -> e.getNodeName().equals(name)) + .filter(e -> Objects.equals(e.getAttribute(attribute), value)) + .peek(e -> assertThat("not exactly one " + name, ++count[0], is(1))) + .collect(Collectors.toList()) + .get(0); + } +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/JavaProjectEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/JavaProjectEditorTest.java new file mode 100644 index 00000000000..d94dd03dec0 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/JavaProjectEditorTest.java @@ -0,0 +1,239 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import static org.hamcrest.CoreMatchers.anything; +import static org.hamcrest.CoreMatchers.both; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; + +import java.io.InputStream; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Properties; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IJavaProjectEditor; +import org.junit.Rule; +import org.junit.Test; + +/** + * Test cases for the implementation of the {@link IJavaProjectEditor} API. + */ +public class JavaProjectEditorTest { + + @Rule + public final ProjectEditorFixture<? extends IJavaProjectEditor> fixture; + + public JavaProjectEditorTest() { + this(new ProjectEditorFixture<>(IJavaProjectEditor.class)); + } + + JavaProjectEditorTest(ProjectEditorFixture<? extends IJavaProjectEditor> fixture) { + super(); + + this.fixture = fixture; + } + + @Test + @MissingFiles + public void getMissingFiles() { + // The .project file already exists + assertThat(fixture.getEditor().getMissingFiles(), + both(hasItem(".classpath")).and(hasItem("build.properties"))); + } + + @Test + @MissingFiles + public void createFiles() { + fixture.getEditor().createFiles(new HashSet<>(Arrays.asList(".classpath", "build.properties"))); + assertThat(fixture.slurp(".classpath"), hasItem(anything())); + assertThat(fixture.getProject().getFile("build.properties").isAccessible(), is(true)); + } + + @Test + public void getMissingNature() { + assertThat(fixture.getEditor().getMissingNature(), hasItem(IJavaProjectEditor.JAVA_NATURE)); + } + + @Test + public void hasNature() { + assertThat(fixture.getEditor().hasNature(IJavaProjectEditor.JAVA_NATURE), is(false)); + fixture.getEditor().create(); + assertThat(fixture.getEditor().hasNature(IJavaProjectEditor.JAVA_NATURE), is(true)); + fixture.getEditor().save(); + + // It's actually in the file + assertThat(fixture.slurp(".project"), hasItem(containsString(IJavaProjectEditor.JAVA_NATURE))); + } + + @Test + public void getMissingBuildCommand() { + assertThat(fixture.getEditor().getMissingBuildCommand(), hasItem(IJavaProjectEditor.JAVA_BUILD_COMMAND)); + } + + @Test + public void addBuildCommands() { + fixture.getEditor().addBuildCommands(Collections.singleton("org.eclipse.papyrus.foo")); + fixture.getEditor().save(); + assertThat(fixture.slurp(".project"), hasItem(containsString("org.eclipse.papyrus.foo"))); + } + + @Test + public void hasBuildCommand() { + assertThat(fixture.getEditor().hasBuildCommand(IJavaProjectEditor.JAVA_BUILD_COMMAND), is(false)); + fixture.getEditor().create(); + assertThat(fixture.getEditor().hasBuildCommand(IJavaProjectEditor.JAVA_BUILD_COMMAND), is(true)); + fixture.getEditor().save(); + + // It's actually in the file + assertThat(fixture.slurp(".project"), hasItem(containsString(IJavaProjectEditor.JAVA_BUILD_COMMAND))); + } + + @MissingFiles + @Test + public void exists() { + assertThat(fixture.getEditor().exists(), is(false)); + fixture.getEditor().create(); + fixture.getEditor().save(); + + assertThat(fixture.getEditor().exists(), is(true)); + } + + @Test + public void registerSourceFolder() { + fixture.getEditor().registerSourceFolder("src-gen"); + fixture.getEditor().save(); + assertThat(getBuildProperties().getProperty("source..", ""), containsString("src-gen")); + } + + @Test + public void registerBinFolder() { + fixture.getEditor().registerBinFolder("classes"); + fixture.getEditor().save(); + assertThat(getBuildOutputProperty(), containsString("classes")); + } + + @Test + public void addToBuild() { + fixture.getEditor().addToBuild("foo.xml"); + fixture.getEditor().save(); + assertThat(getBuildProperties().getProperty("bin.includes", ""), containsString("foo.xml")); + } + + @Test + public void isRegisteredSourceFolder() { + fixture.getEditor().registerSourceFolder("src-gen"); + fixture.getEditor().save(); + assertThat(fixture.getEditor().isRegisteredSourceFolder("src-gen"), is(true)); + } + + @Test + public void isRegisteredBinFolder() { + fixture.getEditor().registerBinFolder("classes"); + fixture.getEditor().save(); + assertThat(fixture.getEditor().isRegisteredBinFolder("classes"), is(true)); + } + + @Test + public void getSourceFolders() { + fixture.getEditor().registerSourceFolder("src"); + fixture.getEditor().registerSourceFolder("src-gen"); + fixture.getEditor().save(); + + assertThat(Arrays.asList(fixture.getEditor().getSourceFolders()), + both(hasItem("src")).and(hasItem("src-gen"))); + } + + @CreatedProject + @Test + public void getBinFolders() { + fixture.getEditor().addSourceFolderToClasspath("src", "bin"); + fixture.getEditor().addSourceFolderToClasspath("src-gen", "bin-gen"); + fixture.getEditor().save(); + + assertThat(Arrays.asList(fixture.getEditor().getBinFolders()), + both(hasItem("bin")).and(hasItem("bin-gen"))); + } + + @Test + public void getElementsInBuild() { + fixture.getEditor().addToBuild("META-INF/MANIFEST.MF"); + fixture.getEditor().addToBuild("plugin.xml"); + fixture.getEditor().addToBuild("plugin.properties"); + fixture.getEditor().save(); + + assertThat(Arrays.asList(fixture.getEditor().getElementsInBuild()), + both(hasItem("META-INF/MANIFEST.MF")).and(hasItem("plugin.xml")).and(hasItem("plugin.properties"))); + } + + @CreatedProject + @Test + public void addSourceFolderToClasspath() { + fixture.getEditor().addSourceFolderToClasspath("src-gen"); + fixture.getEditor().save(); + + assertThat(fixture.slurp(".classpath"), + hasItem(both(containsString("\"src\"")).and(containsString("src-gen")))); + } + + @CreatedProject + @Test + public void addJavaSourceFolder() { + fixture.getEditor().addJavaSourceFolder("src-gen"); + fixture.getEditor().save(); + + assertThat(fixture.slurp(".classpath"), + hasItem(both(containsString("\"src\"")).and(containsString("src-gen")))); + assertThat(getBuildProperties().getProperty("source..", ""), containsString("src-gen")); + } + + @CreatedProject + @Test + public void isSourceFolderRegistered() { + fixture.getEditor().addSourceFolderToClasspath("src-gen"); + fixture.getEditor().save(); + + assertThat(fixture.getEditor().isSourceFolderRegistered("src-gen"), is(true)); + } + + // + // Test framework + // + + Properties getBuildProperties() { + Properties result = new Properties(); + try (InputStream input = fixture.getProject().getFile("build.properties").getContents()) { + result.load(input); + } catch (Exception e) { + e.printStackTrace(); + fail("Failed to load build properties: " + e.getMessage()); + } + return result; + } + + // The build editor may or may not use the modern convention of "output.." + // instead of "bin.." for the output folder(s) + String getBuildOutputProperty() { + Properties build = getBuildProperties(); + String result = build.getProperty("output.."); + if (result == null) { + result = build.getProperty("bin..", ""); + } + return result; + } +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java new file mode 100644 index 00000000000..abdc1281116 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java @@ -0,0 +1,490 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import static org.eclipse.papyrus.junit.matchers.MoreMatchers.regexContains; +import static org.hamcrest.CoreMatchers.both; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.either; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.junit.Assert.assertThat; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import org.eclipse.osgi.service.resolver.VersionRange; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; +import org.eclipse.pde.core.project.IPackageImportDescription; +import org.eclipse.pde.core.project.IRequiredBundleDescription; +import org.junit.Rule; +import org.junit.Test; + +/** + * Test cases for the implementation of the {@link IManifestEditor} API. + */ +@CreatedProject +public class ManifestEditorTest { + + @Rule + public final ProjectEditorFixture<? extends IManifestEditor> fixture; + + public ManifestEditorTest() { + this(new ProjectEditorFixture<>(IManifestEditor.class)); + } + + ManifestEditorTest(ProjectEditorFixture<? extends IManifestEditor> fixture) { + super(); + + this.fixture = fixture; + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void addDependencyString() { + // Add a dependency that wasn't there before + fixture.getEditor().addDependency("org.eclipse.jface"); + + // And try to add one that was there before + fixture.getEditor().addDependency("com.google.guava"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + // We have JFace without a version + assertThat(one(manifest, "org.eclipse.jface"), not(containsString(";"))); + + // And still just the one one Guava with its version + assertThat(one(manifest, "com.google.guava"), containsString(";bundle-version=\"15.0.0\"")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void addDependencyStringString() { + // Add a dependency that wasn't there before + fixture.getEditor().addDependency("org.eclipse.jface", "3.10.0"); + + // And set the version of an existing dependency + fixture.getEditor().addDependency("org.eclipse.core.resources", "3.6.0"); + + // And change the version of an existing dependency + fixture.getEditor().addDependency("org.eclipse.ui", "[3.2.0,4.0.0)"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + // We have JFace with a version + assertThat(one(manifest, "org.eclipse.jface"), containsString(";bundle-version=\"3.10.0\"")); + + // And one Resources with a new version and the same other directives + assertThat(one(manifest, "org.eclipse.core.resources"), + both(containsString(";bundle-version=\"3.6.0\"")).and( + containsString(";visibility:=reexport"))); + + // And one UI with a new range (not an appended range) + assertThat(one(manifest, "org.eclipse.ui"), + both(containsString(";bundle-version=\"[3.2.0,4.0.0)\"")).and( + not(containsString(";bundle-version=\"3.6.0\"")))); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void hasDependency() { + assertThat(fixture.getEditor().hasDependency("org.eclipse.jface"), is(false)); + assertThat(fixture.getEditor().hasDependency("org.eclipse.ui"), is(true)); + assertThat(fixture.getEditor().hasDependency("org.eclipse.core.resources"), is(true)); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void setValueStringString() { + // One that doesn't yet exist + fixture.getEditor().setValue("Eclipse-LazyStart", "true"); + // And one that does + fixture.getEditor().setValue("Bundle-Localization", "OSGI-INF/l10n/bundle"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + assertThat(one(manifest, "Eclipse-LazyStart"), is("Eclipse-LazyStart: true")); + assertThat(one(manifest, "Bundle-Localization"), is("Bundle-Localization: OSGI-INF/l10n/bundle")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getValueString() { + assertThat(fixture.getEditor().getValue("Bundle-Vendor"), is("Papyrus Project")); + assertThat(fixture.getEditor().getValue("Eclipse-LazyStart"), nullValue()); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getValueStringString() { + assertThat(fixture.getEditor().getValue("author-info", "Full-Name"), is("Christian W. Damus")); + assertThat(fixture.getEditor().getValue("author-info", "Disposition"), nullValue()); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void setValueStringStringString() { + // One that doesn't yet exist + fixture.getEditor().setValue("author-info", "Disposition", "happy"); + // And one that does + fixture.getEditor().setValue("author-info", "Company", "self-employed"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + assertThat(one(manifest, "Disposition"), is("Disposition: happy")); + assertThat(one(manifest, "Company"), is("Company: self-employed")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void removeValueStringString() { + // Attempt to remove one that doesn't exist + fixture.getEditor().removeValue("author-info", "Disposition"); + // And one that does + fixture.getEditor().removeValue("author-info", "Company"); + + fixture.getEditor().save(); + + assertThat(getManifest(), not(hasItem(containsString("Company:")))); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void removeValueString() { + // Attempt to remove one that doesn't exist + fixture.getEditor().removeValue("Eclipse-LazyStart"); + // And one that does + fixture.getEditor().removeValue("Bundle-Localization"); + + fixture.getEditor().save(); + + assertThat(getManifest(), not(hasItem(containsString("Bundle-Localization:")))); + } + + @Test + public void setSymbolicBundleName() { + fixture.getEditor().setSymbolicBundleName("org.eclipse.papyrus.something"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-SymbolicName:"), regexContains("\\sorg\\.eclipse\\.papyrus\\.something$")); + + // And change the name + fixture.getEditor().setSymbolicBundleName("org.eclipse.papyrus.new.name"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-SymbolicName:"), regexContains("\\sorg\\.eclipse\\.papyrus\\.new\\.name$")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getSymbolicBundleName() { + assertThat(fixture.getEditor().getSymbolicBundleName(), is("org.eclipse.papyrus.foo")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getBundleName() { + assertThat(fixture.getEditor().getBundleName(), is("Papyrus Test Bundle")); + } + + @Test + public void setBundleName() { + fixture.getEditor().setBundleName("My Bundle"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-Name:"), regexContains("\\sMy Bundle$")); + + // And change the name + fixture.getEditor().setBundleName("A Better Name"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-Name:"), regexContains("\\sA Better Name$")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getBundleVersion() { + assertThat(fixture.getEditor().getBundleVersion(), is("2.0.0.qualifier")); + } + + @Test + public void setBundleVersion() { + fixture.getEditor().setBundleVersion("0.1.0.qualifier"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-Version:"), regexContains("\\s0\\.1\\.0\\.qualifier$")); + + // And change the name + fixture.getEditor().setBundleVersion("2.0.0"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-Version:"), regexContains("\\s2\\.0\\.0$")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getBundleVendor() { + assertThat(fixture.getEditor().getBundleVendor(), is("Papyrus Project")); + } + + @Test + public void setBundleVendor() { + fixture.getEditor().setBundleVendor("Me"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-Vendor:"), regexContains("\\sMe$")); + + // And change the name + fixture.getEditor().setBundleVendor("Eclipse Modeling Project"); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-Vendor:"), regexContains("\\sEclipse Modeling Project$")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getBundleLocalization() { + assertThat(fixture.getEditor().getBundleLocalization(), is("plugin")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void setSingleton() { + fixture.getEditor().setSingleton(true); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "Bundle-SymbolicName:"), regexContains("\\.foo;singleton:=true$")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void addImportPackageString() { + // Add a dependency that wasn't there before + fixture.getEditor().addImportPackage("org.eclipse.jface.viewers"); + + // And try to add one that was there before + fixture.getEditor().addImportPackage("org.eclipse.emf.ecore"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + // We have viewers without a version + assertThat(one(manifest, "org.eclipse.jface.viewers"), not(containsString(";"))); + + // And still just the one one Ecore with its version + assertThat(one(manifest, "org.eclipse.emf.ecore"), containsString(";version=\"2.10.0\"")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void addImportPackageStringString() { + // Add a dependency that wasn't there before + fixture.getEditor().addImportPackage("org.eclipse.jface.viewers", "3.10.0"); + + // And set the version of an existing dependency + fixture.getEditor().addImportPackage("com.ibm.icu.text", "54.0.0"); + + // And change the version of an existing dependency + fixture.getEditor().addImportPackage("org.eclipse.emf.ecore", "[2.12.0,3.0.0)"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + // We have viewers with a version + assertThat(one(manifest, "org.eclipse.jface.viewers"), containsString(";version=\"3.10.0\"")); + + // And one ICU with a new version and the same other directives + assertThat(one(manifest, "com.ibm.icu.text"), + both(containsString(";version=\"54.0.0\"")).and( + containsString(";resolution:=optional"))); + + // And one Ecore with a new range (not an appended range) + assertThat(one(manifest, "org.eclipse.emf.ecore"), + both(containsString(";version=\"[2.12.0,3.0.0)\"")).and( + not(containsString(";version=\"2.10.0\"")))); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void addExportPackageString() { + // Add a package that wasn't there before + fixture.getEditor().addExportPackage("org.eclipse.papyrus.bar"); + + // And try to add one that was there before + fixture.getEditor().addExportPackage("org.eclipse.papyrus.foo.tests"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + // We have bar without a version + assertThat(one(manifest, "org.eclipse.papyrus.bar"), not(containsString(";"))); + + // And still just the one one foo with its version + assertThat(one(manifest, "org.eclipse.papyrus.foo.tests"), containsString(";version=\"2.0.0\"")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void addExportPackageStringString() { + // Add a package that wasn't there before + fixture.getEditor().addExportPackage("org.eclipse.papyrus.bar", "1.2.0"); + + // And set the version of an existing package + fixture.getEditor().addExportPackage( + "org.eclipse.papyrus.eclipse.project.editors.tests", "2.0.0"); + + // And change the version of an existing dependency + fixture.getEditor().addExportPackage("org.eclipse.papyrus.foo.tests", "1.1.100"); + + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + // We have bar with a version + assertThat(one(manifest, "org.eclipse.papyrus.bar"), containsString(";version=\"1.2.0\"")); + + // And one tests with a new version and the same other directives + assertThat(one(manifest, "org.eclipse.papyrus.eclipse.project.editors.tests"), + both(containsString(";version=\"2.0.0\"")).and( + containsString(";x-internal:=true"))); + + // And one foo with a new range (not an appended range) + assertThat(one(manifest, "org.eclipse.papyrus.foo.tests"), + both(containsString(";version=\"1.1.100\"")).and( + not(containsString(";version=\"2.0.0\"")))); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getRequiredBundles() { + List<IRequiredBundleDescription> required = fixture.getEditor().getRequiredBundles(); + + assertThat(required.size(), is(5)); + assertThat(required.get(0).getVersionRange(), is(VersionRange.valueOf("[1.2.0,2.0.0)"))); + assertThat(required.get(1).getName(), is("org.eclipse.papyrus.eclipse.project.editors")); + assertThat(required.get(2).isOptional(), is(true)); + assertThat(required.get(4).getName(), is("org.eclipse.core.resources")); + assertThat(required.get(4).getVersionRange(), either(nullValue()).or(is(VersionRange.emptyRange))); + assertThat(required.get(4).isExported(), is(true)); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void getImportedPackages() { + List<IPackageImportDescription> imported = fixture.getEditor().getImportedPackages(); + + assertThat(imported.size(), is(2)); + assertThat(imported.get(0).getName(), is("com.ibm.icu.text")); + assertThat(imported.get(0).getVersionRange(), either(nullValue()).or(is(VersionRange.emptyRange))); + assertThat(imported.get(0).isOptional(), is(true)); + assertThat(imported.get(1).getName(), is("org.eclipse.emf.ecore")); + assertThat(imported.get(1).getVersionRange(), is(VersionRange.valueOf("2.10.0"))); + assertThat(imported.get(1).isOptional(), is(false)); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void setRequiredBundleExported() { + fixture.getEditor().setRequiredBundleExported("com.google.guava", true); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "com.google.guava"), containsString(";visibility:=reexport")); + + // And remove it + fixture.getEditor().setRequiredBundleExported("com.google.guava", false); + fixture.getEditor().save(); + + assertThat(one(getManifest(), "com.google.guava"), not(containsString("visibility:=reexport"))); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void removeRequiredBundle() { + fixture.getEditor().removeRequiredBundle("org.eclipse.ui"); + fixture.getEditor().removeRequiredBundle("org.eclipse.core.resources"); + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + assertThat(manifest, hasItem(" org.eclipse.papyrus.eclipse.project.editors;bundle-version=\"[2.0.0,3.0.0)\",")); + + // This is now the last one (no trailing comma) + assertThat(manifest, hasItem(" com.google.guava;bundle-version=\"15.0.0\"")); + } + + @WithResource("manifest_project/META-INF/MANIFEST.MF") + @Test + public void removeImportedPackage() { + fixture.getEditor().removeImportedPackage("org.eclipse.emf.ecore"); + fixture.getEditor().save(); + + List<String> manifest = getManifest(); + + // This is now the last one (no trailing comma) + assertThat(manifest, hasItem("Import-Package: com.ibm.icu.text;resolution:=optional")); + } + + @MissingFiles + @Test + public void exists() { + assertThat(fixture.getEditor().exists(), is(false)); + fixture.getEditor().create(); + fixture.getEditor().save(); + + assertThat(fixture.getEditor().exists(), is(true)); + } + + @MissingFiles + @Test + public void getMissingFiles() { + // The .project file already exists + assertThat(fixture.getEditor().getMissingFiles(), hasItem("META-INF/MANIFEST.MF")); + } + + @MissingFiles + @Test + public void createFiles() { + fixture.getEditor().createFiles(Collections.singleton("META-INF/MANIFEST.MF")); + assertThat(fixture.slurp("META-INF/MANIFEST.MF"), hasItem(containsString("Manifest-Version:"))); + } + + // + // Test framework + // + + List<String> getManifest() { + return fixture.slurp("META-INF/MANIFEST.MF"); + } + + String one(List<String> list, String substring) { + int[] count = { 0 }; + return list.stream() + .filter(s -> s.contains(substring)) + .peek(s -> assertThat("not exactly one " + s, ++count[0], is(1))) + .collect(Collectors.toList()) + .get(0); + } +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/MissingFiles.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/MissingFiles.java new file mode 100644 index 00000000000..68284075e84 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/MissingFiles.java @@ -0,0 +1,39 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor; + +/** + * Annotation for the {@link IProjectEditor#getMissingFiles()} test case to indicate + * that the fixture should not create the files required by the project. + * The missing-files annotation implies {@link CreatedProject @CreatedProject(false)}; + * the created-project annotation is ignored when the missing-files annotation + * is present with a {@code true} value. + * + * @see CreatedProject + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface MissingFiles { + /** + * Whether the project's missing files should not be created (default is {@code true}). + */ + boolean value() default true; +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/PluginEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/PluginEditorTest.java new file mode 100644 index 00000000000..0e3e65f4118 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/PluginEditorTest.java @@ -0,0 +1,483 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.fail; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Field; +import java.util.stream.Stream; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor; +import org.eclipse.papyrus.junit.utils.rules.AnnotationRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; + +/** + * Test cases for the implementation of the {@link IPluginProjectEditor} API. + */ +public class PluginEditorTest { + + private final AnnotationRule<String> delegateKey = AnnotationRule.create(Delegate.class); + + private final ProjectEditorFixture<IPluginEditor> fixture = new ProjectEditorFixture<>(IPluginEditor.class, this::activeDelegate); + + @Rule + public final TestRule rules = RuleChain.outerRule(delegateKey).around(fixture); + + @Delegate("project") + private final ProjectEditorTest project = new ProjectEditorTest(fixture); + + @Delegate("plugin") + private final PluginProjectEditorTest pluginProject = new PluginProjectEditorTest(fixture); + + @Delegate("java") + private final JavaProjectEditorTest javaProject = new JavaProjectEditorTest(fixture); + + @Delegate("manifest") + private final ManifestEditorTest manifest = new ManifestEditorTest(fixture); + + // + // Tests for the IPluginEditor specific API + // + + @Test + public void pluginManifestExists() { + assertThat(fixture.getEditor().pluginManifestExists(), is(false)); + pluginProject.exists(); + assertThat(fixture.getEditor().pluginManifestExists(), is(true)); + } + + // + // Tests for the IProjectEditor API + // + + @Delegate("project") + @Test + public void getMissingFiles_project() { + delegate(); + } + + @Delegate("plugin") + @Test + public void getMissingFiles_plugin() { + delegate(); + } + + @Delegate("java") + @Test + public void getMissingFiles_java() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getMissingFiles_manifest() { + delegate(); + } + + @Delegate("project") + @Test + public void addFile() { + delegate(); + } + + // + // Tests for the IPluginProjectEditor API + // + + @Delegate("plugin") + @Test + public void addExtension() { + delegate(); + } + + @Delegate("plugin") + @Test + public void getExtensions() { + delegate(); + } + + @Delegate("plugin") + @Test + public void setAttribute() { + delegate(); + } + + @Delegate("plugin") + @Test + public void getMissingNature_plugin() { + delegate(); + } + + @Delegate("java") + @Test + public void getMissingNature_java() { + delegate(); + } + + @Delegate("plugin") + @Test + public void getMissingBuildCommand_plugin() { + delegate(); + } + + @Delegate("java") + @Test + public void getMissingBuildCommand_java() { + delegate(); + } + + // + // Tests for the IJavaProjectEditor API + // + + @Delegate("java") + @Test + public void createFiles_java() { + delegate(); + } + + @Delegate("manifest") + @Test + public void createFiles_manifest() { + delegate(); + } + + @Delegate("java") + @Test + public void hasNature() { + delegate(); + } + + @Delegate("java") + @Test + public void addBuildCommands() { + delegate(); + } + + @Delegate("java") + @Test + public void hasBuildCommand() { + delegate(); + } + + @Delegate("java") + @Test + public void exists_java() { + delegate(); + } + + @Delegate("manifest") + @Test + public void exists_manifest() { + delegate(); + } + + @Delegate("java") + @Test + public void registerSourceFolder() { + delegate(); + } + + @Delegate("java") + @Test + public void registerBinFolder() { + delegate(); + } + + @Delegate("java") + @Test + public void addToBuild() { + delegate(); + } + + @Delegate("java") + @Test + public void isRegisteredSourceFolder() { + delegate(); + } + + @Delegate("java") + @Test + public void isRegisteredBinFolder() { + delegate(); + } + + @Delegate("java") + @Test + public void getSourceFolders() { + delegate(); + } + + @Delegate("java") + @Test + public void getBinFolders() { + delegate(); + } + + @Delegate("java") + @Test + public void getElementsInBuild() { + delegate(); + } + + @Delegate("java") + @Test + public void addSourceFolderToClasspath() { + delegate(); + } + + @Delegate("java") + @Test + public void addJavaSourceFolder() { + delegate(); + } + + @Delegate("java") + @Test + public void isSourceFolderRegistered() { + delegate(); + } + + // + // Tests for the IManifestEditor API + // + + @Delegate("manifest") + @Test + public void addDependencyString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void addDependencyStringString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void hasDependency() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setValueStringString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getValueString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getValueStringString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setValueStringStringString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void removeValueStringString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void removeValueString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setSymbolicBundleName() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getSymbolicBundleName() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getBundleName() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setBundleName() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getBundleVersion() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setBundleVersion() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getBundleVendor() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setBundleVendor() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getBundleLocalization() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setSingleton() { + delegate(); + } + + @Delegate("manifest") + @Test + public void addImportPackageString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void addImportPackageStringString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void addExportPackageString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void addExportPackageStringString() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getRequiredBundles() { + delegate(); + } + + @Delegate("manifest") + @Test + public void getImportedPackages() { + delegate(); + } + + @Delegate("manifest") + @Test + public void setRequiredBundleExported() { + delegate(); + } + + @Delegate("manifest") + @Test + public void removeRequiredBundle() { + delegate(); + } + + @Delegate("manifest") + @Test + public void removeImportedPackage() { + delegate(); + } + + // + // Test framework + // + + private Object activeDelegate() { + String key = delegateKey.get(); + Field field = (key == null) ? null : Stream.of(PluginEditorTest.class.getDeclaredFields()) + .filter(f -> { + Delegate delegate = f.getAnnotation(Delegate.class); + return (delegate != null) && key.equals(delegate.value()); + }) + .findFirst().get(); + + try { + return (field == null) ? null : field.get(this); + } catch (Exception e) { + e.printStackTrace(); + fail("Reflection failed: " + e.getMessage()); + return null; // unreachable + } + } + + private void delegate() { + Object delegate = activeDelegate(); + String methodName = fixture.getTestMethod(); + int index = methodName.indexOf('_'); + if (index >= 0) { + methodName = methodName.substring(0, index); + } + + try { + MethodHandle testCase = MethodHandles.lookup().findVirtual(delegate.getClass(), methodName, MethodType.methodType(void.class)); + testCase.bindTo(delegate).invoke(); + } catch (Error e) { + throw e; + } catch (Throwable e) { + e.printStackTrace(); + fail("Test reflection failed: " + e.getMessage()); + } + } + + @Target({ ElementType.METHOD, ElementType.FIELD }) + @Retention(RetentionPolicy.RUNTIME) + public @interface Delegate { + String value(); + } +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/PluginProjectEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/PluginProjectEditorTest.java new file mode 100644 index 00000000000..2e3fef63f28 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/PluginProjectEditorTest.java @@ -0,0 +1,125 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import static org.hamcrest.CoreMatchers.anything; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.junit.Assert.assertThat; + +import java.util.List; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor; +import org.junit.Rule; +import org.junit.Test; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * Test cases for the implementation of the {@link IPluginProjectEditor} API. + */ +@CreatedProject +public class PluginProjectEditorTest { + + @Rule + public final ProjectEditorFixture<? extends IPluginProjectEditor> fixture; + + public PluginProjectEditorTest() { + this(new ProjectEditorFixture<>(IPluginProjectEditor.class)); + } + + PluginProjectEditorTest(ProjectEditorFixture<? extends IPluginProjectEditor> fixture) { + super(); + + this.fixture = fixture; + } + + @CreatedProject(false) + @Test + public void exists() { + assertThat(fixture.getEditor().exists(), is(false)); + fixture.getEditor().create(); + fixture.getEditor().save(); + + assertThat(fixture.getEditor().exists(), is(true)); + + assertThat(fixture.slurp("plugin.xml"), hasItem(containsString("<plugin>"))); + } + + @Test + public void addExtension() { + fixture.getEditor().addExtension("org.eclipse.foo"); + fixture.getEditor().save(); + + assertThat(fixture.slurp("plugin.xml"), hasItem(containsString("point=\"org.eclipse.foo\""))); + } + + @Test + public void getExtensions() { + fixture.getEditor().addExtension("org.eclipse.foo"); + fixture.getEditor().save(); + + List<Node> extensions = fixture.getEditor().getExtensions("org.eclipse.foo"); + Element extension = extensions.stream() + .filter(Element.class::isInstance) + .map(Element.class::cast) + .findAny().orElse(null); + assertThat(extension, notNullValue()); + assertThat(extension.getNodeName(), is("extension")); + assertThat(extension.getAttribute("point"), is("org.eclipse.foo")); + } + + @Test + public void setAttribute() { + Element extension = fixture.getEditor().addExtension("org.eclipse.foo"); + fixture.getEditor().setAttribute(extension, "id", "org.eclipse.papyrus.foo.test"); + fixture.getEditor().save(); + + assertThat(fixture.slurp("plugin.xml"), hasItem(containsString("id=\"org.eclipse.papyrus.foo.test\""))); + } + + @MissingFiles + @Test + public void getMissingFiles() { + assertThat(fixture.getEditor().getMissingFiles(), hasItem("plugin.xml")); + } + + @CreatedProject(false) + @Test + public void getMissingNature() { + assertThat(fixture.getEditor().getMissingNature(), hasItem(IPluginProjectEditor.PLUGIN_NATURE)); + fixture.getEditor().create(); + fixture.getEditor().save(); + assertThat(fixture.getEditor().getMissingNature(), not(hasItem(anything()))); + + // And it's in the file + assertThat(fixture.slurp(".project"), hasItem(containsString(IPluginProjectEditor.PLUGIN_NATURE))); + } + + @CreatedProject(false) + @Test + public void getMissingBuildCommand() { + assertThat(fixture.getEditor().getMissingBuildCommand(), hasItem(IPluginProjectEditor.PLUGIN_BUILD_COMMAND)); + fixture.getEditor().create(); + fixture.getEditor().save(); + assertThat(fixture.getEditor().getMissingBuildCommand(), not(hasItem(anything()))); + + // And it's in the file + assertThat(fixture.slurp(".project"), hasItem(containsString(IPluginProjectEditor.PLUGIN_BUILD_COMMAND))); + } + +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ProjectEditorFixture.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ProjectEditorFixture.java new file mode 100644 index 00000000000..11a4acef20c --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ProjectEditorFixture.java @@ -0,0 +1,248 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.function.Supplier; +import java.util.function.UnaryOperator; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IFeatureProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IFileEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IJavaProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor; +import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors; +import org.eclipse.papyrus.junit.utils.JUnitUtils; +import org.eclipse.papyrus.junit.utils.rules.ProjectFixture; +import org.junit.Test; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; +import org.osgi.framework.FrameworkUtil; + +/** + * Test fixture managing a project editor under test with utilities for + * manipulating and verifying its contents. + */ +public class ProjectEditorFixture<T extends IFileEditor> extends ProjectFixture { + private final Class<T> editorType; + + private final UnaryOperator<Description> testTransform; + + private T editor; + + private Description test; + private boolean isMissingFilesTest; + private boolean isCreatedProjectTest; + private String[] testResources; + + public ProjectEditorFixture(Class<T> editorType) { + this(editorType, UnaryOperator.identity()); + } + + public ProjectEditorFixture(Class<T> editorType, Supplier<?> testInstance) { + this(editorType, createTestTransform(testInstance)); + } + + public ProjectEditorFixture(Class<T> editorType, UnaryOperator<Description> testTransform) { + super(); + + this.editorType = editorType; + this.testTransform = testTransform; + } + + private static UnaryOperator<Description> createTestTransform(Supplier<?> testInstance) { + return desc -> { + Description result = desc; + + Object test = testInstance.get(); + if (test != null) { + Class<?> testClass = test.getClass(); + String testMethodName = upTo(desc.getMethodName(), '_'); + + Method testMethod = Stream.of(testClass.getMethods()) + .filter(m -> m.isAnnotationPresent(Test.class)) + .filter(m -> m.getParameterCount() == 0) + .filter(m -> m.getReturnType() == void.class) + .filter(m -> testMethodName.equals(m.getName())) + .findFirst().get(); + + result = Description.createTestDescription(testClass, testMethod.getName(), testMethod.getAnnotations()); + } + + return result; + }; + } + + private static String upTo(String s, char stop) { + int index = s.indexOf(stop); + return (index < 0) ? s : s.substring(0, index); + } + + @Override + public Statement apply(Statement base, Description description) { + test = description; + + return super.apply(base, description); + } + + public String getTestMethod() { + return test.getMethodName(); + } + + private void initTest() { + Description test = testTransform.apply(this.test); + + isMissingFilesTest = Optional.ofNullable(JUnitUtils.getAnnotation(test, MissingFiles.class)) + .map(MissingFiles::value).orElse(false); + + if (!isMissingFilesTest) { + isCreatedProjectTest = Optional.ofNullable(JUnitUtils.getAnnotation(test, CreatedProject.class)) + .map(CreatedProject::value).orElse(false); + } + + testResources = Optional.ofNullable(JUnitUtils.getAnnotation(test, WithResource.class)) + .map(WithResource::value).orElseGet(() -> new String[0]); + } + + @Override + protected void createProject(String name) throws CoreException { + initTest(); + + super.createProject(name); + + IProject project = getProject(); + + // Create the required test resources in the project *before* initializing the editor + Stream.of(testResources).forEach(res -> { + try (InputStream input = getResource(res).openStream()) { + // Remove the first segment for the folder partition below resources/ + IFile file = getProject().getFile(new Path(res).removeFirstSegments(1)); + ensureContainer(file); + file.create(input, false, null); + } catch (Exception e) { + e.printStackTrace(); + fail("Failed to create test resource: " + e.getMessage()); + } + }); + + if (editorType == IProjectEditor.class) { + editor = editorType.cast(ProjectEditors.getProjectEditor(project)); + } else if (editorType == IPluginProjectEditor.class) { + editor = editorType.cast(ProjectEditors.getPluginProjectEditor(project)); + } else if (editorType == IJavaProjectEditor.class) { + editor = editorType.cast(ProjectEditors.getJavaProjectEditor(project)); + } else if (editorType == IManifestEditor.class) { + editor = editorType.cast(ProjectEditors.getManifestEditor(project)); + } else if (editorType == IPluginEditor.class) { + editor = editorType.cast(ProjectEditors.getPluginEditor(project)); + } else if (editorType == IFeatureProjectEditor.class) { + editor = editorType.cast(ProjectEditors.getFeatureProjectEditor(project)); + } else { + fail("Unsupported editor type: " + editorType); + } + + editor.init(); + + if (!isMissingFilesTest) { + editor.createFiles(getRequiredFiles()); + } + if (isCreatedProjectTest) { + editor.create(); + editor.save(); + } + } + + private void ensureContainer(IResource resource) throws CoreException { + IContainer container = resource.getParent(); + if (!container.exists() && (container instanceof IFolder)) { + // Ultimately, the project exists + ensureContainer(container); + ((IFolder) container).create(false, true, null); + } + } + + protected Set<String> getRequiredFiles() { + Set<String> result = new HashSet<>(); + + result.add(".project"); + if (editor instanceof IManifestEditor) { + result.add("META-INF/MANIFEST.MF"); + } + if (editor instanceof IBuildEditor) { + result.add("build.properties"); + } + if (editor instanceof IClasspathEditor) { + result.add(".classpath"); + } + if (editor instanceof IPluginProjectEditor) { + result.add("plugin.xml"); + } + if (editor instanceof IFeatureProjectEditor) { + result.add("feature.xml"); + } + + return result; + } + + @Override + protected void deleteProject() { + editor = null; + + super.deleteProject(); + } + + public T getEditor() { + return editor; + } + + public URL getResource(String resourcePath) { + IPath fullPath = new Path("resources").append(resourcePath).removeTrailingSeparator(); + return FrameworkUtil.getBundle(getClass()).getEntry(fullPath.toString()); + } + + public List<String> slurp(String filePath) { + IFile file = getProject().getFile(filePath); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getContents(), file.getCharset()))) { + return reader.lines().collect(Collectors.toList()); + } catch (Exception e) { + e.printStackTrace(); + fail("Failed to load test project file: " + e.getMessage()); + return null; // Unreachable + } + } +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ProjectEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ProjectEditorTest.java new file mode 100644 index 00000000000..062f5e0ebbe --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ProjectEditorTest.java @@ -0,0 +1,58 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.junit.Assert.assertThat; + +import java.util.List; + +import org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor; +import org.junit.Rule; +import org.junit.Test; + +/** + * Test cases for the implementation of the {@link IProjectEditor} API. + */ +public class ProjectEditorTest { + + @Rule + public final ProjectEditorFixture<? extends IProjectEditor> fixture; + + public ProjectEditorTest() { + this(new ProjectEditorFixture<>(IProjectEditor.class)); + } + + ProjectEditorTest(ProjectEditorFixture<? extends IProjectEditor> fixture) { + super(); + + this.fixture = fixture; + } + + @Test + @MissingFiles + public void getMissingFiles() { + // The .project file already exists (cannot be avoided) + assertThat(fixture.getEditor().getMissingFiles(), not(hasItem(".project"))); + } + + @Test + public void addFile() { + fixture.getEditor().addFile(fixture.getResource("simple_project/hello.txt"), "hello.txt", true); + List<String> lines = fixture.slurp("hello.txt"); + assertThat(lines, hasItem("Hello, world!")); + } + +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/TriConsumer.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/TriConsumer.java new file mode 100644 index 00000000000..564060af9f7 --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/TriConsumer.java @@ -0,0 +1,24 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import java.util.function.BiConsumer; + +/** + * Like a {@link BiConsumer}, only … guess. + */ +@FunctionalInterface +public interface TriConsumer<A, B, C> { + void accept(A a, B b, C c); +} diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/WithResource.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/WithResource.java new file mode 100644 index 00000000000..f92789fab7c --- /dev/null +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/WithResource.java @@ -0,0 +1,29 @@ +/***************************************************************************** + * Copyright (c) 2016 Christian W. Damus 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: + * Christian W. Damus - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.eclipse.project.editors.tests; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation for test cases that need one or more resources created in the + * test project. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface WithResource { + String[] value(); +} diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.project b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.project index 9db6e009552..3aeac6b4d5e 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.project +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.junit.framework</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.junit.framework</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF index 48d0b085360..72752fa45ef 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF @@ -1,17 +1,15 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.junit.framework.classification,
- org.eclipse.papyrus.junit.framework.classification.rules,
- org.eclipse.papyrus.junit.framework.classification.tests,
- org.eclipse.papyrus.junit.framework.runner
-Require-Bundle: org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.10.0",
- org.eclipse.ui;bundle-version="3.106.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.core.runtime;bundle-version="3.10.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Conditional Junit Annotations
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.junit.framework
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Export-Package: org.eclipse.papyrus.junit.framework.classification, + org.eclipse.papyrus.junit.framework.classification.rules, + org.eclipse.papyrus.junit.framework.classification.tests, + org.eclipse.papyrus.junit.framework.runner +Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.tools;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)", + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)" +Bundle-Vendor: Eclipse Modeling Project +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Conditional Junit Annotations +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.junit.framework +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.project b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.project index d98bd52c0f8..b8353c892df 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.project +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/.project @@ -1,28 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.junit.utils</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>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.junit.utils</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> + <buildCommand> + <name>org.eclipse.oomph.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> + <key>ignore.lower.bound.dependency.ranges</key> + <value>true</value> + </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value> + </dictionary> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.oomph.version.VersionNature</nature> + </natures> +</projectDescription> diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF index 9c3bee5815d..2083148c6fc 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF @@ -1,44 +1,25 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.jdt.ui,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.ui.navigator,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.emf.edit;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.e4.ui.workbench;bundle-version="1.1.0",
- org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
- org.eclipse.e4.core.contexts;bundle-version="1.3.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.junit.matchers,
- org.eclipse.papyrus.junit.utils,
- org.eclipse.papyrus.junit.utils.resources,
- org.eclipse.papyrus.junit.utils.rules,
- org.eclipse.papyrus.junit.utils.tests
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.junit.utils
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)", + org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)", + org.eclipse.e4.ui.model.workbench;bundle-version="[1.2.0,2.0.0)", + org.eclipse.e4.core.contexts;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport +Export-Package: org.eclipse.papyrus.junit.matchers, + org.eclipse.papyrus.junit.utils, + org.eclipse.papyrus.junit.utils.resources, + org.eclipse.papyrus.junit.utils.rules, + org.eclipse.papyrus.junit.utils.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.junit.utils +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |