Merge "Added resolveArtifact() implementation for OfficeHandler" into develop
diff --git a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java b/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
index f4efbe1..5f923e5 100644
--- a/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
+++ b/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
@@ -117,9 +117,7 @@
if (handlerName.equals(wrapper.getArtifactHandler())) {
Object originalObject = handler.resolveArtifact(object);
if (originalObject != null) {
- String artifactName = handler.getDisplayName(originalObject);
- // remove unwanted characters like ", '
- artifactLabel = artifactName.replaceAll(CHARACTERS_TO_BE_REMOVED, "");
+ artifactLabel = handler.getDisplayName(originalObject);
} else { // original object cannot be resolved
// therefore use the wrapper name
String label = EMFHelper.getIdentifier(object);
@@ -130,7 +128,8 @@
} else {
artifactLabel = EMFHelper.getIdentifier(object);
}
- return artifactLabel;
+ // remove unwanted characters like ", '
+ return artifactLabel.replaceAll(CHARACTERS_TO_BE_REMOVED, " ");
}
}