diff options
Diffstat (limited to 'org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common')
4 files changed, 20 insertions, 9 deletions
diff --git a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/BundleUtilities.java b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/BundleUtilities.java index 9b37763..d85fb8c 100644 --- a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/BundleUtilities.java +++ b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/BundleUtilities.java @@ -3,9 +3,11 @@ * 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 v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 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 583580e..b3ff5a9 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 @@ -3,9 +3,11 @@ * 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 v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation @@ -161,12 +163,15 @@ class EntityUtils { } def static LEntity getEntityFromDto(JvmType type) { + if(type === null) { + return null + } var LEntity entity = null try { var qualifiedDtoName = type?.qualifiedName var resourceSet = type?.eResource?.resourceSet val objectDescs = ServiceListener.getEObjectDescriptions(OSBPDtoPackage.Literals.LDTO, qualifiedDtoName) - if (objectDescs?.iterator.hasNext) { + if (objectDescs !== null && objectDescs.iterator.hasNext) { val eobjectDesc = objectDescs.iterator.next if (resourceSet !== null) { var dto = resourceSet.getEObject(eobjectDesc.EObjectURI, true) as LDto diff --git a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/ServiceListener.java b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/ServiceListener.java index 56f2237..2a92ccb 100644 --- a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/ServiceListener.java +++ b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/ServiceListener.java @@ -3,9 +3,11 @@ * 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 v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/SystemInformation.java b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/SystemInformation.java index 3a6c7c6..264be09 100644 --- a/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/SystemInformation.java +++ b/org.eclipse.osbp.utils/src/org/eclipse/osbp/utils/common/SystemInformation.java @@ -3,9 +3,11 @@ * 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 v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation |