catch up with development

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.tools.graphical.entity.lib/src/org/eclipse/osbp/tools/graphical/entity/lib/service/EntityService.java b/org.eclipse.osbp.tools.graphical.entity.lib/src/org/eclipse/osbp/tools/graphical/entity/lib/service/EntityService.java
index b1f382d..a2c8ca1 100644
--- a/org.eclipse.osbp.tools.graphical.entity.lib/src/org/eclipse/osbp/tools/graphical/entity/lib/service/EntityService.java
+++ b/org.eclipse.osbp.tools.graphical.entity.lib/src/org/eclipse/osbp/tools/graphical/entity/lib/service/EntityService.java
@@ -283,7 +283,7 @@
 
 	public boolean isCascading(LFeature att) {
 		if (att instanceof LReference) {
-			return ((LReference) att).isCascading();
+			return ((LReference) att).isCascadeMergePersist();
 		}
 		return false;
 	}
@@ -536,8 +536,6 @@
 		LEntityAttribute entityAtt = OSBPEntityFactory.eINSTANCE.createLEntityAttribute();
 
 		entityAtt.setAnnotationInfo(beanAtt.getAnnotationInfo());
-		entityAtt.setCascadeMergePersist(beanAtt.isCascadeMergePersist());
-		entityAtt.setCascadeRemove(beanAtt.isCascadeRemove());
 		entityAtt.setDerived(beanAtt.isDerived());
 		entityAtt.setDirty(beanAtt.isDirty());
 		entityAtt.setDerivedGetterExpression(beanAtt.getDerivedGetterExpression());
@@ -562,8 +560,6 @@
 		LBeanAttribute beanAtt = OSBPEntityFactory.eINSTANCE.createLBeanAttribute();
 
 		beanAtt.setAnnotationInfo(entityAtt.getAnnotationInfo());
-		beanAtt.setCascadeMergePersist(entityAtt.isCascadeMergePersist());
-		beanAtt.setCascadeRemove(entityAtt.isCascadeRemove());
 		beanAtt.setDerived(entityAtt.isDerived());
 		beanAtt.setDirty(entityAtt.isDirty());
 		beanAtt.setDerivedGetterExpression(entityAtt.getDerivedGetterExpression());