catch up with branch daily Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.utils/.classpath b/org.eclipse.osbp.utils/.classpath index 12b082f..3a43a46 100644 --- a/org.eclipse.osbp.utils/.classpath +++ b/org.eclipse.osbp.utils/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="src" path="test/"/>
diff --git a/org.eclipse.osbp.utils/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.utils/.settings/org.eclipse.jdt.core.prefs index 8e3baab..f42de36 100644 --- a/org.eclipse.osbp.utils/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.osbp.utils/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/EntityUtils.xtend b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/EntityUtils.xtend index b3ff5a9..72cfeae 100644 --- a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/EntityUtils.xtend +++ b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/EntityUtils.xtend
@@ -34,6 +34,9 @@ class EntityUtils { def static String getQualifiedDtoNameForEntity(JvmType type) { + if(type === null) { + return null + } try { var qualifiedEntityName = type.qualifiedName var resourceSet = type.eResource.resourceSet
diff --git a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/entityhelper/DataType.xtend b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/entityhelper/DataType.xtend index 80b5444..84c0be5 100644 --- a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/entityhelper/DataType.xtend +++ b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/entityhelper/DataType.xtend
@@ -162,29 +162,29 @@ } if (!lDataType.properties.isNullOrEmpty) { // data type is defined as Blob - if (getJvmType(attribute).string && lDataType.properties.exists[it.key.toLowerCase.equals(IPropertyConstants.PROPERTY_BLOB)]){ + if (getJvmType(attribute).string && lDataType.properties.exists[it.key.equalsIgnoreCase(IPropertyConstants.PROPERTY_BLOB)]){ return EType.BLOPMAPPING } // data type is defined as rich text area - if (getJvmType(attribute).string && lDataType.properties.exists[it.value.toLowerCase.equals(IPropertyConstants.PROPERTY_RICH_TEXT)]){ + if ((getJvmType(attribute).string || lDataType.asBlob) && lDataType.properties.exists[it.value.equalsIgnoreCase(IPropertyConstants.PROPERTY_RICH_TEXT)]){ return EType.RICHTEXTAREA } // data type is defined as checkbox - if (getJvmType(attribute).boolean && lDataType.properties.exists[it.value.toLowerCase.equals(IPropertyConstants.PROPERTY_CHECKBOX)]){ + if (getJvmType(attribute).boolean && lDataType.properties.exists[it.value.equalsIgnoreCase(IPropertyConstants.PROPERTY_CHECKBOX)]){ return EType.BOOLEAN_CHECKBOX } } if (!attribute.properties.isNullOrEmpty) { // Otherwise entity attribute is defined as Blob - if (getJvmType(attribute).string && attribute.properties.exists[it.key.toLowerCase.equals(IPropertyConstants.PROPERTY_BLOB)]){ + if (getJvmType(attribute).string && attribute.properties.exists[it.key.equalsIgnoreCase(IPropertyConstants.PROPERTY_BLOB)]){ return EType.BLOPMAPPING } // Otherwise entity attribute is defined as rich text area - if (getJvmType(attribute).string && attribute.properties.exists[it.value.toLowerCase.equals(IPropertyConstants.PROPERTY_RICH_TEXT)]){ + if ((getJvmType(attribute).string || lDataType.asBlob) && attribute.properties.exists[it.value.equalsIgnoreCase(IPropertyConstants.PROPERTY_RICH_TEXT)]){ return EType.RICHTEXTAREA } // data type is defined as rich text area - if (getJvmType(attribute).boolean && lDataType.properties.exists[it.value.toLowerCase.equals(IPropertyConstants.PROPERTY_CHECKBOX)]){ + if (getJvmType(attribute).boolean && lDataType.properties.exists[it.value.equalsIgnoreCase(IPropertyConstants.PROPERTY_CHECKBOX)]){ return EType.BOOLEAN_CHECKBOX } }
diff --git a/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/annotation/CommonUtils.java b/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/annotation/CommonUtils.java index b591c60..16d0586 100644 --- a/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/annotation/CommonUtils.java +++ b/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/annotation/CommonUtils.java
@@ -2,10 +2,10 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ - * + * * SPDX-License-Identifier: EPL-2.0 * * Contributors:
diff --git a/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/common/EntityUtils.java b/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/common/EntityUtils.java index af90b25..575e633 100644 --- a/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/common/EntityUtils.java +++ b/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/common/EntityUtils.java
@@ -2,10 +2,10 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ - * + * * SPDX-License-Identifier: EPL-2.0 * * Contributors: @@ -37,6 +37,9 @@ @SuppressWarnings("all") public class EntityUtils { public static String getQualifiedDtoNameForEntity(final JvmType type) { + if ((type == null)) { + return null; + } try { String qualifiedEntityName = type.getQualifiedName(); ResourceSet resourceSet = type.eResource().getResourceSet();
diff --git a/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/entityhelper/DataType.java b/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/entityhelper/DataType.java index 9117172..6631f81 100644 --- a/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/entityhelper/DataType.java +++ b/org.eclipse.osbp.utils/xtend-gen/org/eclipse/osbp/utils/entityhelper/DataType.java
@@ -2,10 +2,10 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ - * + * * SPDX-License-Identifier: EPL-2.0 * * Contributors: @@ -210,38 +210,56 @@ boolean _isNullOrEmpty = IterableExtensions.isNullOrEmpty(lDataType.getProperties()); boolean _not = (!_isNullOrEmpty); if (_not) { - if ((this.typeHelper.isString(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), ((Function1<LKeyAndValue, Boolean>) (LKeyAndValue it) -> { - return Boolean.valueOf(it.getKey().toLowerCase().equals(IPropertyConstants.PROPERTY_BLOB)); - })))) { + if ((this.typeHelper.isString(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), new Function1<LKeyAndValue, Boolean>() { + @Override + public Boolean apply(final LKeyAndValue it) { + return Boolean.valueOf(it.getKey().equalsIgnoreCase(IPropertyConstants.PROPERTY_BLOB)); + } + }))) { return IDataMart.EType.BLOPMAPPING; } - if ((this.typeHelper.isString(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), ((Function1<LKeyAndValue, Boolean>) (LKeyAndValue it) -> { - return Boolean.valueOf(it.getValue().toLowerCase().equals(IPropertyConstants.PROPERTY_RICH_TEXT)); - })))) { + if (((this.typeHelper.isString(this.getJvmType(attribute)) || lDataType.isAsBlob()) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), new Function1<LKeyAndValue, Boolean>() { + @Override + public Boolean apply(final LKeyAndValue it) { + return Boolean.valueOf(it.getValue().equalsIgnoreCase(IPropertyConstants.PROPERTY_RICH_TEXT)); + } + }))) { return IDataMart.EType.RICHTEXTAREA; } - if ((this.typeHelper.isBoolean(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), ((Function1<LKeyAndValue, Boolean>) (LKeyAndValue it) -> { - return Boolean.valueOf(it.getValue().toLowerCase().equals(IPropertyConstants.PROPERTY_CHECKBOX)); - })))) { + if ((this.typeHelper.isBoolean(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), new Function1<LKeyAndValue, Boolean>() { + @Override + public Boolean apply(final LKeyAndValue it) { + return Boolean.valueOf(it.getValue().equalsIgnoreCase(IPropertyConstants.PROPERTY_CHECKBOX)); + } + }))) { return IDataMart.EType.BOOLEAN_CHECKBOX; } } boolean _isNullOrEmpty_1 = IterableExtensions.isNullOrEmpty(attribute.getProperties()); boolean _not_1 = (!_isNullOrEmpty_1); if (_not_1) { - if ((this.typeHelper.isString(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(attribute.getProperties(), ((Function1<LKeyAndValue, Boolean>) (LKeyAndValue it) -> { - return Boolean.valueOf(it.getKey().toLowerCase().equals(IPropertyConstants.PROPERTY_BLOB)); - })))) { + if ((this.typeHelper.isString(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(attribute.getProperties(), new Function1<LKeyAndValue, Boolean>() { + @Override + public Boolean apply(final LKeyAndValue it) { + return Boolean.valueOf(it.getKey().equalsIgnoreCase(IPropertyConstants.PROPERTY_BLOB)); + } + }))) { return IDataMart.EType.BLOPMAPPING; } - if ((this.typeHelper.isString(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(attribute.getProperties(), ((Function1<LKeyAndValue, Boolean>) (LKeyAndValue it) -> { - return Boolean.valueOf(it.getValue().toLowerCase().equals(IPropertyConstants.PROPERTY_RICH_TEXT)); - })))) { + if (((this.typeHelper.isString(this.getJvmType(attribute)) || lDataType.isAsBlob()) && IterableExtensions.<LKeyAndValue>exists(attribute.getProperties(), new Function1<LKeyAndValue, Boolean>() { + @Override + public Boolean apply(final LKeyAndValue it) { + return Boolean.valueOf(it.getValue().equalsIgnoreCase(IPropertyConstants.PROPERTY_RICH_TEXT)); + } + }))) { return IDataMart.EType.RICHTEXTAREA; } - if ((this.typeHelper.isBoolean(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), ((Function1<LKeyAndValue, Boolean>) (LKeyAndValue it) -> { - return Boolean.valueOf(it.getValue().toLowerCase().equals(IPropertyConstants.PROPERTY_CHECKBOX)); - })))) { + if ((this.typeHelper.isBoolean(this.getJvmType(attribute)) && IterableExtensions.<LKeyAndValue>exists(lDataType.getProperties(), new Function1<LKeyAndValue, Boolean>() { + @Override + public Boolean apply(final LKeyAndValue it) { + return Boolean.valueOf(it.getValue().equalsIgnoreCase(IPropertyConstants.PROPERTY_CHECKBOX)); + } + }))) { return IDataMart.EType.BOOLEAN_CHECKBOX; } }