Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2018-05-10 13:56:13 -0400
committerEd Willink2018-05-11 13:21:24 -0400
commitfaefd325313a0bc7896b4e8417395fec8b71b197 (patch)
tree8d4d9f6137b2e5b5b9b9a429a555530609d47c1c
parent8b1d92634c3d4ae1dc7487dd2f1e07e164559ff4 (diff)
downloadorg.eclipse.qvtd-faefd325313a0bc7896b4e8417395fec8b71b197.tar.gz
org.eclipse.qvtd-faefd325313a0bc7896b4e8417395fec8b71b197.tar.xz
org.eclipse.qvtd-faefd325313a0bc7896b4e8417395fec8b71b197.zip
[531687] Fix namespace, warnings, regen
-rw-r--r--plugins/org.eclipse.qvtd.xml/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.qvtd.xml/build.properties3
-rw-r--r--plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/XMLmodelPackage.java2
-rw-r--r--plugins/org.eclipse.qvtd.xml/model/XMLmodel.ecore177
-rw-r--r--plugins/org.eclipse.qvtd.xml/model/XMLmodel.genmodel2
-rw-r--r--plugins/org.eclipse.qvtd.xml/plugin.xml8
-rw-r--r--plugins/org.eclipse.qvtd.xml/src/org/eclipse/qvtd/xml/utilities/XMLmodelResourceFactoryImpl.java (renamed from plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/util/XMLmodelResourceFactoryImpl.java)11
7 files changed, 147 insertions, 57 deletions
diff --git a/plugins/org.eclipse.qvtd.xml/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xml/META-INF/MANIFEST.MF
index 778a7f703..fc4276e48 100644
--- a/plugins/org.eclipse.qvtd.xml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xml/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Export-Package: org.eclipse.qvtd.xml,
org.eclipse.qvtd.xml.util,
org.eclipse.qvtd.xml.utilities
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.qvtd.xml/build.properties b/plugins/org.eclipse.qvtd.xml/build.properties
index 1154ccbb4..c25dffce7 100644
--- a/plugins/org.eclipse.qvtd.xml/build.properties
+++ b/plugins/org.eclipse.qvtd.xml/build.properties
@@ -7,6 +7,7 @@ bin.includes = .,\
plugin.properties,\
about.html
jars.compile.order = .
-source.. = emf-gen/
+source.. = emf-gen/,\
+ src/
output.. = bin/
src.includes = about.html
diff --git a/plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/XMLmodelPackage.java b/plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/XMLmodelPackage.java
index 926ed8421..4bdf5718c 100644
--- a/plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/XMLmodelPackage.java
+++ b/plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/XMLmodelPackage.java
@@ -50,7 +50,7 @@ public interface XMLmodelPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "http://www.eclipse.org/qvt/2015/XML";
+ String eNS_URI = "http://www.eclipse.org/qvt/2018/XML";
/**
* The package namespace name.
diff --git a/plugins/org.eclipse.qvtd.xml/model/XMLmodel.ecore b/plugins/org.eclipse.qvtd.xml/model/XMLmodel.ecore
index 59c6f04df..01a68cdf4 100644
--- a/plugins/org.eclipse.qvtd.xml/model/XMLmodel.ecore
+++ b/plugins/org.eclipse.qvtd.xml/model/XMLmodel.ecore
@@ -1,56 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xml" nsURI="http://www.eclipse.org/qvt/2015/XML" nsPrefix="sax">
- <eClassifiers xsi:type="ecore:EClass" name="Attribute" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
+<ecore:EPackage
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ name="xml"
+ nsURI="http://www.eclipse.org/qvt/2018/XML"
+ nsPrefix="sax">
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="Attribute"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="name"
+ ordered="false"
+ lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="value"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CDATA" eSuperTypes="#//Node"/>
- <eClassifiers xsi:type="ecore:EClass" name="Characters" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" ordered="false" lowerBound="1"
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="CDATA"
+ eSuperTypes="#//Node"/>
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="Characters"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="data"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" ordered="false" lowerBound="1"
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="Comment"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="data"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DTD" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="DTD"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="name"
+ ordered="false"
+ lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="publicId"
+ ordered="false"
+ lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="systemId"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicId" ordered="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="systemId" ordered="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Document" eSuperTypes="#//Node"/>
- <eClassifiers xsi:type="ecore:EClass" name="Element" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="localName" ordered="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" ordered="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" ordered="false" lowerBound="1"
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="Document"
+ eSuperTypes="#//Node"/>
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="Element"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="localName"
+ ordered="false"
+ lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="qName"
+ ordered="false"
+ lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="uri"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Entity" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="Entity"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="name"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Node" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//Node" containment="true"/>
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="Node"
+ abstract="true">
+ <eStructuralFeatures
+ xsi:type="ecore:EReference"
+ name="children"
+ upperBound="-1"
+ eType="#//Node"
+ containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PrefixMapping" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" ordered="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" ordered="false" lowerBound="1"
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="PrefixMapping"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="prefix"
+ ordered="false"
+ lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="uri"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ProcessingInstruction" eSuperTypes="#//Node">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="target" ordered="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" ordered="false" lowerBound="1"
+ <eClassifiers
+ xsi:type="ecore:EClass"
+ name="ProcessingInstruction"
+ eSuperTypes="#//Node">
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="target"
+ ordered="false"
+ lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures
+ xsi:type="ecore:EAttribute"
+ name="data"
+ ordered="false"
+ lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.qvtd.xml/model/XMLmodel.genmodel b/plugins/org.eclipse.qvtd.xml/model/XMLmodel.genmodel
index 4d1db0c2f..a34d9a814 100644
--- a/plugins/org.eclipse.qvtd.xml/model/XMLmodel.genmodel
+++ b/plugins/org.eclipse.qvtd.xml/model/XMLmodel.genmodel
@@ -6,7 +6,7 @@
importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
operationReflection="true" importOrganizing="true">
<foreignModel>XMLmodel.ecore</foreignModel>
- <genPackages prefix="XMLmodel" basePackage="org.eclipse.qvtd" resource="XMI" disposableProviderFactory="true"
+ <genPackages prefix="XMLmodel" basePackage="org.eclipse.qvtd" disposableProviderFactory="true"
generateExampleClass="false" ecorePackage="XMLmodel.ecore#/">
<genClasses ecoreClass="XMLmodel.ecore#//Attribute">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute XMLmodel.ecore#//Attribute/name"/>
diff --git a/plugins/org.eclipse.qvtd.xml/plugin.xml b/plugins/org.eclipse.qvtd.xml/plugin.xml
index f04b5db52..15794e7cb 100644
--- a/plugins/org.eclipse.qvtd.xml/plugin.xml
+++ b/plugins/org.eclipse.qvtd.xml/plugin.xml
@@ -9,15 +9,9 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated XMLmodel -->
<package
- uri="http://www.eclipse.org/qvt/2015/XML"
+ uri="http://www.eclipse.org/qvt/2018/XML"
class="org.eclipse.qvtd.xml.XMLmodelPackage"
genModel="model/XMLmodel.genmodel"/>
</extension>
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <!-- @generated XMLmodel -->
- <parser
- type="xmlmodel"
- class="org.eclipse.qvtd.xml.util.XMLmodelResourceFactoryImpl"/>
- </extension>
</plugin>
diff --git a/plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/util/XMLmodelResourceFactoryImpl.java b/plugins/org.eclipse.qvtd.xml/src/org/eclipse/qvtd/xml/utilities/XMLmodelResourceFactoryImpl.java
index cc344e235..0d38ad554 100644
--- a/plugins/org.eclipse.qvtd.xml/emf-gen/org/eclipse/qvtd/xml/util/XMLmodelResourceFactoryImpl.java
+++ b/plugins/org.eclipse.qvtd.xml/src/org/eclipse/qvtd/xml/utilities/XMLmodelResourceFactoryImpl.java
@@ -12,26 +12,21 @@
*
* </copyright>
*/
-package org.eclipse.qvtd.xml.util;
+package org.eclipse.qvtd.xml.utilities;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.qvtd.xml.utilities.XMLmodelResourceImpl;
/**
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
* @see org.eclipse.qvtd.xml.util.XMLmodelResourceImpl
- * @generated
*/
public class XMLmodelResourceFactoryImpl extends ResourceFactoryImpl {
/**
* Creates an instance of the resource factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
*/
public XMLmodelResourceFactoryImpl() {
super();
@@ -39,14 +34,10 @@ public class XMLmodelResourceFactoryImpl extends ResourceFactoryImpl {
/**
* Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
*/
@Override
public Resource createResource(URI uri) {
Resource result = new XMLmodelResourceImpl(uri);
return result;
}
-
} //XMLmodelResourceFactoryImpl

Back to the top