catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.xtext.entitymock/.classpath b/org.eclipse.osbp.xtext.entitymock/.classpath
index 7ce5543..9cb695d 100644
--- a/org.eclipse.osbp.xtext.entitymock/.classpath
+++ b/org.eclipse.osbp.xtext.entitymock/.classpath
@@ -2,9 +2,10 @@
<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="emf-gen/"/>
- <classpathentry kind="src" path="src-gen/"/>
- <classpathentry kind="src" path="xtend-gen/"/>
- <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="emf-gen"/>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="model"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.xtend b/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.xtend
index dfaf422..e322a2e 100644
--- a/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.xtend
+++ b/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.xtend
@@ -32,6 +32,7 @@
import org.eclipse.osbp.dsl.semantic.entity.LBean
import org.eclipse.osbp.dsl.semantic.entity.LEntity
import org.eclipse.osbp.dsl.semantic.entity.LEntityAttribute
+import org.eclipse.osbp.dsl.semantic.entity.LEntityReference
import org.eclipse.osbp.runtime.common.event.IEventDispatcher
import org.eclipse.osbp.ui.api.customfields.IBlobService
import org.eclipse.osbp.utils.annotation.CommonUtils
@@ -92,7 +93,6 @@
import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder
import org.osgi.service.component.annotations.Component
import org.slf4j.Logger
-import org.eclipse.osbp.dsl.semantic.entity.LEntityReference
/**
* <p>Infers a JVM model from the source model.</p>
@@ -1151,11 +1151,11 @@
} else if (param.isReferenceOnExistingDto) {
paramString = '''«paramString»(«param.jvmType.identifier»)((«EntityUtils.
getDtoFQNForLEntity(param.nestedAttribute.reference.type)»)getAttribute("«param.
- nestedAttribute.attribute.name»", mockDataGenerator, persistenceUnit)).get«param.
+ nestedAttribute.attribute.name»", mockDataGenerator)).get«param.
nestedAttribute.reference.name.toFirstUpper»()'''
} else {
paramString = '''«paramString»(«param.jvmType.identifier»)getAttribute("«param.
- getParamName(".")»", mockDataGenerator, persistenceUnit)'''
+ getParamName(".")»", mockDataGenerator)'''
}
}
append(
diff --git a/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/scoping/EntityMockDSLScopeProvider.xtend b/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/scoping/EntityMockDSLScopeProvider.xtend
index 5448425..c38dc5b 100644
--- a/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/scoping/EntityMockDSLScopeProvider.xtend
+++ b/org.eclipse.osbp.xtext.entitymock/src/org/eclipse/osbp/xtext/entitymock/scoping/EntityMockDSLScopeProvider.xtend
@@ -32,6 +32,7 @@
import org.eclipse.osbp.xtext.entitymock.EntityMockDSLPackage
import org.eclipse.osbp.xtext.entitymock.EntityMockEntities
import org.eclipse.osbp.xtext.entitymock.EntityMockEntity
+import org.eclipse.osbp.xtext.entitymock.EntityMockEntityNestedAttribute
import org.eclipse.osbp.xtext.entitymock.EntityMockObject
import org.eclipse.osbp.xtext.entitymock.EntityMockObjectArrayValue
import org.eclipse.osbp.xtext.entitymock.EntityMockObjectEmbed
@@ -47,9 +48,6 @@
import org.eclipse.xtext.resource.IEObjectDescription
import org.eclipse.xtext.scoping.IScope
import org.eclipse.xtext.scoping.impl.MapBasedScope
-import org.eclipse.osbp.xtext.entitymock.EntityMockEntityFunctionParameter
-import org.eclipse.osbp.xtext.entitymock.EntityMockEntityFunction
-import org.eclipse.osbp.xtext.entitymock.EntityMockEntityNestedAttribute
/**
* This class contains custom scoping description.
diff --git a/org.eclipse.osbp.xtext.entitymock/xtend-gen/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.java b/org.eclipse.osbp.xtext.entitymock/xtend-gen/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.java
index d30f88d..222b805 100644
--- a/org.eclipse.osbp.xtext.entitymock/xtend-gen/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.java
+++ b/org.eclipse.osbp.xtext.entitymock/xtend-gen/org/eclipse/osbp/xtext/entitymock/jvmmodel/EntityMockDSLJvmModelInferrer.java
@@ -2396,7 +2396,7 @@
_builder_11.append(")getAttribute(\"");
String _name_5 = param.getNestedAttribute().getAttribute().getName();
_builder_11.append(_name_5);
- _builder_11.append("\", mockDataGenerator, persistenceUnit)).get");
+ _builder_11.append("\", mockDataGenerator)).get");
String _firstUpper = StringExtensions.toFirstUpper(param.getNestedAttribute().getReference().getName());
_builder_11.append(_firstUpper);
_builder_11.append("()");
@@ -2410,7 +2410,7 @@
_builder_12.append(")getAttribute(\"");
String _paramName_1 = this.getParamName(param, ".");
_builder_12.append(_paramName_1);
- _builder_12.append("\", mockDataGenerator, persistenceUnit)");
+ _builder_12.append("\", mockDataGenerator)");
paramString = _builder_12.toString();
}
}
