Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Bettini2015-11-07 09:57:11 +0000
committerLorenzo Bettini2015-11-07 09:57:11 +0000
commit1b0e0c39043d13576dde9ba3a6cd4369c9cb275f (patch)
treec1628729e1cc22834ac9a28b20c8589a6eadeaff
parentd65b5adfa2fee1dac97d0a810a03eba2f2ea6960 (diff)
downloadorg.eclipse.emf-parsley-1b0e0c39043d13576dde9ba3a6cd4369c9cb275f.tar.gz
org.eclipse.emf-parsley-1b0e0c39043d13576dde9ba3a6cd4369c9cb275f.tar.xz
org.eclipse.emf-parsley-1b0e0c39043d13576dde9ba3a6cd4369c9cb275f.zip
updated copyrights
Change-Id: I947458b2ea6c9ecc8137844f2a2f3c47533f1711 Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
-rw-r--r--dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend2
-rw-r--r--dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/formatting2/EmfParsleyDslFormatter.xtend17
-rw-r--r--dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/jvmmodel/EmfParsleyDslJvmModelInferrer.xtend51
3 files changed, 40 insertions, 30 deletions
diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend
index 8406d78cf..537a08244 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend
+++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslFormatterTests.xtend
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 RCP Vision (http://www.rcp-vision.com) and others.
+ * Copyright (c) 2015 RCP Vision (http://www.rcp-vision.com) 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
diff --git a/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/formatting2/EmfParsleyDslFormatter.xtend b/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/formatting2/EmfParsleyDslFormatter.xtend
index 310e65b32..b02e6a81c 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/formatting2/EmfParsleyDslFormatter.xtend
+++ b/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/formatting2/EmfParsleyDslFormatter.xtend
@@ -1,6 +1,13 @@
-/*
- * generated by Xtext
- */
+/*******************************************************************************
+ * Copyright (c) 2015 RCP Vision (http://www.rcp-vision.com) 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:
+ * Lorenzo Bettini - initial API and implementation
+ *******************************************************************************/
package org.eclipse.emf.parsley.dsl.formatting2;
import com.google.inject.Provider
@@ -44,6 +51,10 @@ import org.eclipse.xtext.xbase.annotations.xAnnotations.XAnnotation
import static org.eclipse.emf.parsley.dsl.model.ModelPackage.Literals.*
+/**
+ * @author Lorenzo Bettini
+ *
+ */
class EmfParsleyDslFormatter extends XbaseWithAnnotationsFormatter {
override void format(Object o, IFormattableDocument document) {
diff --git a/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/jvmmodel/EmfParsleyDslJvmModelInferrer.xtend b/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/jvmmodel/EmfParsleyDslJvmModelInferrer.xtend
index 5fe4cbb5b..2b0d87f62 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/jvmmodel/EmfParsleyDslJvmModelInferrer.xtend
+++ b/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/jvmmodel/EmfParsleyDslJvmModelInferrer.xtend
@@ -94,17 +94,17 @@ import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder
*/
class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
- /**
- * convenience API to build and initialize JVM types and their members.
- */
+ /**
+ * convenience API to build and initialize JVM types and their members.
+ */
@Inject extension JvmTypesBuilder
-
+
@Inject extension IQualifiedNameProvider
-
+
@Inject extension TypeReferences
-
+
@Inject extension TypesFactory
-
+
@Inject extension EmfParsleyDslGeneratorUtils
@Inject extension EmfParsleyDslTypeSystem
@@ -132,12 +132,12 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
* rely on linking using the index if isPreIndexingPhase is
* <code>true</code>.
*/
- def dispatch void infer(Module element, IJvmDeclaredTypeAcceptor acceptor, boolean isPreIndexingPhase) {
- if (element.name.empty)
- return
-
+ def dispatch void infer(Module element, IJvmDeclaredTypeAcceptor acceptor, boolean isPreIndexingPhase) {
+ if (element.name.empty)
+ return
+
val moduleClass = element.toClass(element.moduleQN)
-
+
val labelProviderClass = element.inferLabelProvider(acceptor)
val tableLabelProviderClass = element.inferTableLabelProvider(acceptor)
val featureCaptionProviderClass = element.inferFeatureCaptionProvider(acceptor)
@@ -210,8 +210,8 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
members += element.resourceManager.genBindMethod(resourceManagerClass, typeof(ResourceManager))
]
- }
-
+ }
+
def private setSuperClassType(JvmGenericType e, WithExtendsClause dslElement, Class<?> defaultSuperClass) {
if (dslElement.extendsClause != null)
e.superTypes += dslElement.extendsClause.superType.cloneWithProxies
@@ -241,7 +241,6 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
members += field
-
members += f.toGetter(name, type)
if (f.writeable) {
members += f.toSetter(name, type)
@@ -252,19 +251,19 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
def private void translateAnnotations(JvmAnnotationTarget target, List<XAnnotation> annotations) {
target.addAnnotations(annotations.filterNull.filter[annotationType != null])
}
-
- def private moduleQN(Module element) {
- element.fullyQualifiedName + ".EmfParsleyGuiceModuleGen"
- }
+
+ def private moduleQN(Module element) {
+ element.fullyQualifiedName + ".EmfParsleyGuiceModuleGen"
+ }
def private labelProviderQN(Module element) {
element.fullyQualifiedName + ".ui.provider.LabelProviderGen"
}
-
+
def private tableLabelProviderQN(Module element) {
element.fullyQualifiedName + ".ui.provider.TableLabelProviderGen"
}
-
+
def private featureCaptionProviderQN(Module element) {
element.fullyQualifiedName + ".ui.provider.FeatureCaptionProviderGen"
}
@@ -328,7 +327,7 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
members += labelProvider.toConstructor() [
parameters += labelProvider.
- toParameter("delegate",
+ toParameter("delegate",
typeRef(AdapterFactoryLabelProvider)
)
body = [it.append("super(delegate);")]
@@ -453,13 +452,13 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
]
}
- def private featureAssociatedExpressionToMethod(JvmGenericType it, FeatureAssociatedExpression spec,
+ def private featureAssociatedExpressionToMethod(JvmGenericType it, FeatureAssociatedExpression spec,
String prefix, JvmTypeReference returnType, (JvmOperation, FeatureAssociatedExpression) => void parameterCreator) {
if (spec.feature?.simpleName != null) {
members += spec.toMethod
(prefix +
spec.parameterType.simpleName + "_" +
- spec.feature.simpleName.propertyNameForGetterSetterMethod,
+ spec.feature.simpleName.propertyNameForGetterSetterMethod,
returnType
) [
parameterCreator.apply(it, spec)
@@ -652,7 +651,7 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
private def toConstructorWithInjectedAdapterFactory(EObject e) {
e.toConstructor() [
parameters += e.
- toParameter("adapterFactory",
+ toParameter("adapterFactory",
typeRef(AdapterFactory)
)
body = [it.append("super(adapterFactory);")]
@@ -783,7 +782,7 @@ class EmfParsleyDslJvmModelInferrer extends AbstractModelInferrer {
ControlFactorySpecification spec, (JvmOperation)=>void init
) {
spec.toMethod
- (spec.methodNameForFormFeatureSpecification("control_"),
+ (spec.methodNameForFormFeatureSpecification("control_"),
typeRef(Control)
, init)
}

Back to the top