catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.utils.entitymock.dbfill.ui/src/org/eclipse/osbp/utils/entitymock/dbfill/ui/EntityMockGeneratorConsumer.java b/org.eclipse.osbp.utils.entitymock.dbfill.ui/src/org/eclipse/osbp/utils/entitymock/dbfill/ui/EntityMockGeneratorConsumer.java
index f322490..49898c9 100644
--- a/org.eclipse.osbp.utils.entitymock.dbfill.ui/src/org/eclipse/osbp/utils/entitymock/dbfill/ui/EntityMockGeneratorConsumer.java
+++ b/org.eclipse.osbp.utils.entitymock.dbfill.ui/src/org/eclipse/osbp/utils/entitymock/dbfill/ui/EntityMockGeneratorConsumer.java
@@ -364,8 +364,12 @@
int count, Object dtoObject) {
try {
dtoService.update(resultClass.cast(dtoObject));
- } catch (Exception e) { // NOSONAR
- // NOSONAR
+ } catch (Exception e) {
+ if (e.getMessage() != null) {
+ log.debug(e.getMessage());
+ } else {
+ log.debug(e.getStackTrace().toString());
+ }
}
// } catch (ConstraintViolationException e) {
// log.error(shortClassName + " #" + (count + 1) + "/" + total + ": " +
diff --git a/org.eclipse.osbp.xtext.entitymock.tests/.classpath b/org.eclipse.osbp.xtext.entitymock.tests/.classpath
index 5da932e..0377d77 100644
--- a/org.eclipse.osbp.xtext.entitymock.tests/.classpath
+++ b/org.eclipse.osbp.xtext.entitymock.tests/.classpath
@@ -2,8 +2,8 @@
<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="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="src-gen/"/>
+ <classpathentry kind="src" path="xtend-gen/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.osbp.xtext.entitymock/.classpath b/org.eclipse.osbp.xtext.entitymock/.classpath
index 9cb695d..7ce5543 100644
--- a/org.eclipse.osbp.xtext.entitymock/.classpath
+++ b/org.eclipse.osbp.xtext.entitymock/.classpath
@@ -2,10 +2,9 @@
<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="model"/>
+ <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="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 e322a2e..27a9b9b 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
@@ -1345,6 +1345,7 @@
return '''(«EntityUtils.getDtoFQNForLBean(attribute.type as LBean)»)(«getting»)'''
}
var etype = dtType.getBasicType(attribute)
+ var jvmType = dtType.getJvmType(attribute)
switch (etype) {
case BOOLEAN: return '''asBoolean(«getting»)'''
case BYTE: return '''asByte(«getting»)'''
@@ -1352,9 +1353,14 @@
case FLOAT: return '''asFloat(«getting»)'''
case DOUBLE: return '''asDouble(«getting»)'''
case SHORT: return '''asShort(«getting»)'''
+ case STRING: return '''asString(«getting»)'''
case INTEGER: return '''asInt(«getting»)'''
case LONG: return '''asLong(«getting»)'''
case TIME: return '''asTime(«getting»)'''
+ case RICHTEXTAREA: if( jvmType.toString == "JvmArrayType: byte[]" )
+ return '''asByteArray(«getting»)'''
+ else
+ return '''asString(«getting»)'''
default: return '''asString(«getting»)'''
}
}
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 222b805..bcd88b2 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
@@ -16,6 +16,7 @@
*/
package org.eclipse.osbp.xtext.entitymock.jvmmodel;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
@@ -2786,6 +2787,7 @@
return _builder_2.toString();
}
IDataMart.EType etype = this.dtType.getBasicType(attribute);
+ JvmType jvmType = this.dtType.getJvmType(attribute);
if (etype != null) {
switch (etype) {
case BOOLEAN:
@@ -2824,37 +2826,59 @@
_builder_8.append(getting);
_builder_8.append(")");
return _builder_8.toString();
- case INTEGER:
+ case STRING:
StringConcatenation _builder_9 = new StringConcatenation();
- _builder_9.append("asInt(");
+ _builder_9.append("asString(");
_builder_9.append(getting);
_builder_9.append(")");
return _builder_9.toString();
- case LONG:
+ case INTEGER:
StringConcatenation _builder_10 = new StringConcatenation();
- _builder_10.append("asLong(");
+ _builder_10.append("asInt(");
_builder_10.append(getting);
_builder_10.append(")");
return _builder_10.toString();
- case TIME:
+ case LONG:
StringConcatenation _builder_11 = new StringConcatenation();
- _builder_11.append("asTime(");
+ _builder_11.append("asLong(");
_builder_11.append(getting);
_builder_11.append(")");
return _builder_11.toString();
- default:
+ case TIME:
StringConcatenation _builder_12 = new StringConcatenation();
- _builder_12.append("asString(");
+ _builder_12.append("asTime(");
_builder_12.append(getting);
_builder_12.append(")");
return _builder_12.toString();
+ case RICHTEXTAREA:
+ String _string = jvmType.toString();
+ boolean _equals = Objects.equal(_string, "JvmArrayType: byte[]");
+ if (_equals) {
+ StringConcatenation _builder_13 = new StringConcatenation();
+ _builder_13.append("asByteArray(");
+ _builder_13.append(getting);
+ _builder_13.append(")");
+ return _builder_13.toString();
+ } else {
+ StringConcatenation _builder_14 = new StringConcatenation();
+ _builder_14.append("asString(");
+ _builder_14.append(getting);
+ _builder_14.append(")");
+ return _builder_14.toString();
+ }
+ default:
+ StringConcatenation _builder_15 = new StringConcatenation();
+ _builder_15.append("asString(");
+ _builder_15.append(getting);
+ _builder_15.append(")");
+ return _builder_15.toString();
}
} else {
- StringConcatenation _builder_12 = new StringConcatenation();
- _builder_12.append("asString(");
- _builder_12.append(getting);
- _builder_12.append(")");
- return _builder_12.toString();
+ StringConcatenation _builder_15 = new StringConcatenation();
+ _builder_15.append("asString(");
+ _builder_15.append(getting);
+ _builder_15.append(")");
+ return _builder_15.toString();
}
}
