Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2018-01-25 06:30:53 -0500
committerEd Merks2018-01-25 06:30:53 -0500
commit06d860757ec6ac86fbf40be45986919ac7e476e9 (patch)
treed23eb35fa809a72a816cbbbbd5771fa4e6e2b414 /examples/org.eclipse.emf.examples.generator.validator
parent7780d0d4d8431bcc2b95129d8ed4e2e05dd30155 (diff)
downloadorg.eclipse.emf-06d860757ec6ac86fbf40be45986919ac7e476e9.tar.gz
org.eclipse.emf-06d860757ec6ac86fbf40be45986919ac7e476e9.tar.xz
org.eclipse.emf-06d860757ec6ac86fbf40be45986919ac7e476e9.zip
[Releng] Updates for working in Photon with a Photon target platform
This includes the following: Regenerated *.java files JET templates using EMF 2.14 Automatic-Module-Name in all MANIFEST.MFs Deprecation warning suppression EMFDevelopmentEnvironmentConfiguration.setup Commenting out com.google.gwt.eclipse.core.gwtProjectValidator All GWT projects fail to validate to build The GWT Project validator is broken as of Oxygen.2 and Photon
Diffstat (limited to 'examples/org.eclipse.emf.examples.generator.validator')
-rw-r--r--examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.emf.examples.generator.validator/src/org/eclipse/emf/examples/generator/validator/templates/model/ModelDescription.java62
2 files changed, 29 insertions, 34 deletions
diff --git a/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF
index cc5e24053..9ea1575e8 100644
--- a/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.emf.examples.generator.validator,
org.eclipse.emf.examples.generator.validator.templates.model
+Automatic-Module-Name: org.eclipse.emf.examples.generator.validator
diff --git a/examples/org.eclipse.emf.examples.generator.validator/src/org/eclipse/emf/examples/generator/validator/templates/model/ModelDescription.java b/examples/org.eclipse.emf.examples.generator.validator/src/org/eclipse/emf/examples/generator/validator/templates/model/ModelDescription.java
index 7a1d73df1..672062425 100644
--- a/examples/org.eclipse.emf.examples.generator.validator/src/org/eclipse/emf/examples/generator/validator/templates/model/ModelDescription.java
+++ b/examples/org.eclipse.emf.examples.generator.validator/src/org/eclipse/emf/examples/generator/validator/templates/model/ModelDescription.java
@@ -23,23 +23,17 @@ public class ModelDescription
protected final String TEXT_6 = ">";
protected final String TEXT_7 = NL;
protected final String TEXT_8 = NL + "Package ";
- protected final String TEXT_9 = " <";
- protected final String TEXT_10 = ">" + NL;
- protected final String TEXT_11 = NL + " Class ";
- protected final String TEXT_12 = NL + " ";
- protected final String TEXT_13 = " ";
- protected final String TEXT_14 = "/";
- protected final String TEXT_15 = " : ";
- protected final String TEXT_16 = NL + " Operation ";
- protected final String TEXT_17 = " : ";
- protected final String TEXT_18 = NL;
- protected final String TEXT_19 = NL + " Enum ";
- protected final String TEXT_20 = NL + " Literal ";
- protected final String TEXT_21 = " = ";
- protected final String TEXT_22 = NL;
- protected final String TEXT_23 = NL + " DataType ";
- protected final String TEXT_24 = " <";
- protected final String TEXT_25 = ">" + NL;
+ protected final String TEXT_9 = ">" + NL;
+ protected final String TEXT_10 = NL + " Class ";
+ protected final String TEXT_11 = NL + " ";
+ protected final String TEXT_12 = " ";
+ protected final String TEXT_13 = "/";
+ protected final String TEXT_14 = " : ";
+ protected final String TEXT_15 = NL + " Operation ";
+ protected final String TEXT_16 = NL + " Enum ";
+ protected final String TEXT_17 = NL + " Literal ";
+ protected final String TEXT_18 = " = ";
+ protected final String TEXT_19 = NL + " DataType ";
public String generate(Object argument)
{
@@ -62,50 +56,50 @@ public class ModelDescription
for (GenPackage genPackage : genModel.getGenPackages()) {
stringBuffer.append(TEXT_8);
stringBuffer.append(genPackage.getPackageName());
- stringBuffer.append(TEXT_9);
+ stringBuffer.append(TEXT_5);
stringBuffer.append(genPackage.getNSURI());
- stringBuffer.append(TEXT_10);
+ stringBuffer.append(TEXT_9);
for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {
if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier;
- stringBuffer.append(TEXT_11);
+ stringBuffer.append(TEXT_10);
stringBuffer.append(genClass.getName());
stringBuffer.append(ValidatorGeneratorUtil.getSuperTypesExpression(genClass));
for (GenFeature genFeature : genClass.getGenFeatures()) {
String keyword = genFeature.isReferenceType() ? "Reference" : "Attribute";
- stringBuffer.append(TEXT_12);
+ stringBuffer.append(TEXT_11);
stringBuffer.append(keyword);
- stringBuffer.append(TEXT_13);
+ stringBuffer.append(TEXT_12);
if (genFeature.isDerived()) {
- stringBuffer.append(TEXT_14);
+ stringBuffer.append(TEXT_13);
}
stringBuffer.append(genFeature.getName());
- stringBuffer.append(TEXT_15);
+ stringBuffer.append(TEXT_14);
stringBuffer.append(ValidatorGeneratorUtil.getTypeExpression(genFeature));
}
for (GenOperation genOperation : genClass.getGenOperations()) {
- stringBuffer.append(TEXT_16);
+ stringBuffer.append(TEXT_15);
stringBuffer.append(genOperation.getName());
stringBuffer.append(ValidatorGeneratorUtil.getParameterExpression(genOperation));
- stringBuffer.append(TEXT_17);
+ stringBuffer.append(TEXT_14);
stringBuffer.append(ValidatorGeneratorUtil.getTypeExpression(genOperation));
}
- stringBuffer.append(TEXT_18);
+ stringBuffer.append(TEXT_7);
} else if (genClassifier instanceof GenEnum) { GenEnum genEnum = (GenEnum)genClassifier;
- stringBuffer.append(TEXT_19);
+ stringBuffer.append(TEXT_16);
stringBuffer.append(genEnum.getName());
for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) {
- stringBuffer.append(TEXT_20);
+ stringBuffer.append(TEXT_17);
stringBuffer.append(genEnumLiteral.getName());
- stringBuffer.append(TEXT_21);
+ stringBuffer.append(TEXT_18);
stringBuffer.append(genEnumLiteral.getValue());
}
- stringBuffer.append(TEXT_22);
+ stringBuffer.append(TEXT_7);
} else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier;
- stringBuffer.append(TEXT_23);
+ stringBuffer.append(TEXT_19);
stringBuffer.append(genDataType.getName());
- stringBuffer.append(TEXT_24);
+ stringBuffer.append(TEXT_5);
stringBuffer.append(genDataType.getEcoreDataType().getInstanceClassName());
- stringBuffer.append(TEXT_25);
+ stringBuffer.append(TEXT_9);
}
}
}

Back to the top