Simplified code in matrix view
Change-Id: Ia3413439de45d15d94ef2ec920c962e6071e1c2e
diff --git a/bundles/org.eclipse.capra.ui.matrix/src/org/eclipse/capra/ui/matrix/TraceabilityMatrixDataProvider.java b/bundles/org.eclipse.capra.ui.matrix/src/org/eclipse/capra/ui/matrix/TraceabilityMatrixDataProvider.java
index e8de81e..4e9ad78 100644
--- a/bundles/org.eclipse.capra.ui.matrix/src/org/eclipse/capra/ui/matrix/TraceabilityMatrixDataProvider.java
+++ b/bundles/org.eclipse.capra.ui.matrix/src/org/eclipse/capra/ui/matrix/TraceabilityMatrixDataProvider.java
@@ -74,18 +74,13 @@
@Override
public Object getDataValue(int colIndex, int rowIndex) {
- EntryData colEntry = columns.get(colIndex);
- EntryData rowEntry = columns.get(rowIndex);
- for (Connection connection : colEntry.connections) {
- for (EObject target : connection.getTargets()) {
- if (!EMFHelper.hasSameIdentifier(colEntry.artifact, target)
- && EMFHelper.hasSameIdentifier(rowEntry.artifact, target)) {
- EObject eClass = connection.getTlink().eClass();
- return (eClass == null ? "" : ((EClass) eClass).getName());
- }
- }
+ Connection connection = getCellConnection(colIndex, rowIndex);
+ if (connection != null) {
+ EObject eClass = connection.getTlink().eClass();
+ return (eClass == null ? "" : ((EClass) eClass).getName());
+ } else {
+ return "";
}
- return "";
}
@Override
