Skip to content

Update IDResolver for multiple reference types Object #1710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariusheine merged 2 commits into from
Jul 17, 2025
Merged

Update IDResolver for multiple reference types Object #1710

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21393c
Fix wrong ID resolver
TruongQuangSB Jul 4, 2025
6df20fd
Merge remote-tracking branch 'github/main' into fix-wrong-id-resolver
mariusheine Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions .../bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/ToolboxIDResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
*/
package org.eclipse.set.core.fileservice;

import java.util.Optional;

import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
Expand All @@ -25,6 +29,7 @@
*/
public class ToolboxIDResolver {
private final GuidCache guidCache = new GuidCache();
private static final String PLANPRO_ID_REFERENCE_ANNOTATION_SOURCE = "planpro/id_reference"; //$NON-NLS-1$

private ToolboxIDResolver(final PlanPro_Schnittstelle model) {
guidCache.prepare(model);
Expand Down Expand Up @@ -123,13 +128,27 @@ private void resolveIDReference(final EObject ref, final String guid) {
}

private static void setIDReference(final EObject ref, final EObject value) {
boolean isValid = false;
final Optional<EAnnotation> idReferenceAnnotation = ref.eClass()
.getEAnnotations()
.stream()
.filter(annotation -> annotation.getSource()
.equals(PLANPRO_ID_REFERENCE_ANNOTATION_SOURCE))
.findFirst();
if (idReferenceAnnotation.isPresent()) {
final EList<EObject> references = idReferenceAnnotation.get()
.getReferences();

isValid = references.stream()
.filter(EClass.class::isInstance)
.anyMatch(reference -> isValidReference((EClass) reference,
value));
} else {
final EReference valueFeature = getValueFeature(ref);
isValid = isValidReference(valueFeature.getEReferenceType(), value);
}

final EClass referenceType = getValueFeature(ref).getEReferenceType();

// If we have a value, check whether it is applicable
final Class<?> valueClass = value.getClass();
final Class<?> referenceClass = referenceType.getInstanceClass();
if (!referenceClass.isAssignableFrom(valueClass)) {
if (!isValid) {
// object found, but has wrong type -> mark invalid
ref.eSet(getValidFeature(ref), Boolean.TRUE);
ref.eSet(getValueFeature(ref), null);
Expand All @@ -139,4 +158,12 @@ private static void setIDReference(final EObject ref, final EObject value) {
ref.eSet(getValueFeature(ref), value);
}

private static boolean isValidReference(final EClass refClass,
final EObject value) {
// If we have a value, check whether it is applicable
final Class<?> valueClass = value.getClass();
final Class<?> referenceClass = refClass.getInstanceClass();
return referenceClass.isAssignableFrom(valueClass);
}

}
Loading