Undo changes wrongly introduced by previous commit
diff --git a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java b/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
index 018a3a4..27d7dde 100644
--- a/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
+++ b/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
@@ -53,8 +53,7 @@
* Objects to create the trace for
* @return root of trace model that now contains the newly created trace
*/
- EObject createTrace(EClass traceType, EObject traceModel, List<EObject> selectionAsEcore,
- List<Object> originalObject);
+ EObject createTrace(EClass traceType, EObject traceModel, List<EObject> selection);
/**
* Used to delete a trace
diff --git a/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore b/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore
index 4fa6de3..edc4cb2 100644
--- a/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore
+++ b/org.eclipse.capra.generic.tracemodels/model/generictrace.xcore
@@ -1,16 +1,10 @@
package org.eclipse.capra.GenericTraceMetaModel
import org.eclipse.emf.ecore.EObject
-import org.eclipse.emf.ecore.util.EcoreUtil
-
class GenericTraceModel{
contains RelatedTo[0..*] traces
}
class RelatedTo {
- derived String ID get {
- EcoreUtil.generateUUID();
- }
- String name
refers EObject [0..*] item
}
\ No newline at end of file
diff --git a/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java b/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
index 75d6b4a..ac067d6 100644
--- a/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
+++ b/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
@@ -13,7 +13,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.stream.Collectors;
+
import org.eclipse.capra.GenericTraceMetaModel.GenericTraceMetaModelFactory;
import org.eclipse.capra.GenericTraceMetaModel.GenericTraceMetaModelPackage;
@@ -21,8 +21,6 @@
import org.eclipse.capra.GenericTraceMetaModel.RelatedTo;
import org.eclipse.capra.core.adapters.Connection;
import org.eclipse.capra.core.adapters.TraceMetaModelAdapter;
-import org.eclipse.capra.core.handlers.ArtifactHandler;
-import org.eclipse.capra.core.helpers.ExtensionPointHelper;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -51,24 +49,13 @@
}
@Override
- public EObject createTrace(EClass traceType, EObject traceModel, List<EObject> selection,
- List<Object> originalSelection) {
+ public EObject createTrace(EClass traceType, EObject traceModel, List<EObject> selection) {
GenericTraceModel TM = (GenericTraceModel) traceModel;
EObject trace = GenericTraceMetaModelFactory.eINSTANCE.create(traceType);
RelatedTo RelatedToTrace = (RelatedTo) trace;
RelatedToTrace.getItem().addAll(selection);
-
- String name = "";
- Collection<ArtifactHandler> artifactHandlers = ExtensionPointHelper.getArtifactHandlers();
- List<ArtifactHandler> availableHandlers = artifactHandlers.stream()
- .filter(handler -> handler.canHandleSelection(originalSelection)).collect(Collectors.toList());
- if (availableHandlers.size() > 1) {
- name = name + " " + availableHandlers.get(0).getDisplayName(originalSelection);
- } else
- name = name + " " + originalSelection.toString();
-
- RelatedToTrace.setName(name);
+
TM.getTraces().add(RelatedToTrace);
return TM;
}
diff --git a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java b/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
index a68e088..10d27a1 100644
--- a/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
+++ b/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
@@ -66,7 +66,7 @@
Optional<EClass> chosenType = chooseTraceType.apply(traceTypes, selectionAsEObjects);
if (chosenType.isPresent()) {
- EObject root = traceAdapter.createTrace(chosenType.get(), traceModel, selectionAsEObjects, selection);
+ EObject root = traceAdapter.createTrace(chosenType.get(), traceModel, selectionAsEObjects);
persistenceAdapter.saveTracesAndArtifacts(root, artifactModel);
}
}
