diff options
| author | ptessier | 2018-09-25 12:04:35 +0000 |
|---|---|---|
| committer | Quentin Le Menez | 2018-11-12 12:35:20 +0000 |
| commit | a508c51752fefaba92d3da7ea486125ee935601e (patch) | |
| tree | 313ffc7ecfbb65b74e3d1812dfb85458d4db09a0 /plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel | |
| parent | d627c55a41968999210e305fc01e09c703a98bfd (diff) | |
| download | org.eclipse.papyrus-a508c51752fefaba92d3da7ea486125ee935601e.tar.gz org.eclipse.papyrus-a508c51752fefaba92d3da7ea486125ee935601e.tar.xz org.eclipse.papyrus-a508c51752fefaba92d3da7ea486125ee935601e.zip | |
Bug 536144 - [EMF Facet] validation of a custom file must be improved
- move code into src-gen
Change-Id: Ifc2097a28a10209689f15d4997afce808fbc451b
Signed-off-by: Patrick Tessier <patrick.tessier@cea.fr>
Diffstat (limited to 'plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel')
14 files changed, 13 insertions, 8 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.classpath index 304e86186aa..f9c46b584dd 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src-gen"/> <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.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> 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 a9cb9ce7678..e1589bf32ff 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,11 +1,15 @@ 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 + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.core.resources;bundle-version="[3.13.100,4.0.0)", + org.eclipse.jdt.core;bundle-version="[3.15.0,4.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)", + org.eclipse.pde.core;bundle-version="[3.12.100,4.0.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-Version: 1.3.0.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.metamodel.internal.Activator Bundle-ManifestVersion: 2 diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/build.properties index adad0a9bffe..f9652bfa7f7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/build.properties +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/build.properties @@ -1,8 +1,9 @@ -source.. = src/ +source.. = src-gen/ output.. = bin/ bin.includes = META-INF/,\ .,\ about.html,\ OSGI-INF/,\ plugin.xml -src.includes = about.html +src.includes = about.html,\ + src-gen/ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel index 416aee4be46..11f221a1c2e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" 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 2.0
 which accompanies this distribution, and is available at
 https://www.eclipse.org/legal/epl-2.0/

 SPDX-License-Identifier: EPL-2.0

 Contributors:
 Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet
 Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. " - modelDirectory="/org.eclipse.papyrus.emf.facet.query.java.metamodel/src" modelPluginID="org.eclipse.papyrus.emf.facet.query.java.metamodel" + modelDirectory="/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen" modelPluginID="org.eclipse.papyrus.emf.facet.query.java.metamodel" modelName="javaQuery" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet"> + complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> <foreignModel>javaQuery-0.2.0.ecore</foreignModel> <genPackages prefix="JavaQuery" basePackage="org.eclipse.papyrus.emf.facet.query.java.metamodel.v0_2_0" disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="javaQuery-0.2.0.ecore#/"> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml index d324eaf51f2..90805bf7be0 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.emf.facet.query.java.metamodel</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/internal/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/internal/Activator.java index ea2a17a3aa8..ea2a17a3aa8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/internal/Activator.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/internal/Activator.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java index 4dceeea9033..4dceeea9033 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java index 3ec38f67510..3ec38f67510 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java index 6f692317cef..6f692317cef 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java index 840dff0700b..840dff0700b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java index fb2b85ccf2d..fb2b85ccf2d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java index 0b958730ea2..0b958730ea2 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java index b557f60c17a..b557f60c17a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java index a52a2f57834..a52a2f57834 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src-gen/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java |