| commit | b51c2c88c8343a51a838aca0bbabc9cb1f904c6e | [log] [tgz] |
|---|---|---|
| author | Dusan Kalanj <kalanj@chalmers.se> | Fri Nov 25 14:51:21 2016 +0100 |
| committer | Jan-Philipp Steghöfer <ec@splashstudio.com> | Fri Jan 27 16:07:09 2017 +0100 |
| tree | bd93e96a44f1d62c807d2a48bd6fc8ad21555179 | |
| parent | fa7540f0531f4d7b85114b43dd18b503550b7235 [diff] |
Office: added readable names to OfficeObjects in trace links - Instead of with their contents, OfficeObjects are now represented with a readable name in a trace. Signed-off-by: Dusan Kalanj <kalanj@chalmers.se>
diff --git a/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java b/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java index 33aec6e..a0a1de1 100644 --- a/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java +++ b/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java
@@ -40,7 +40,7 @@ // TODO here artifactName is the same as the row/paragraph // description. Should it be different? EObject wrapper = adapter.createArtifact(artifactModel, this.getClass().getName(), officeObject.getUri(), - officeObject.toString()); + officeObject.getName()); return wrapper; } else { return null;
diff --git a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/objects/CapraOfficeObject.java b/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/objects/CapraOfficeObject.java index 2575e4e..a48da83 100644 --- a/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/objects/CapraOfficeObject.java +++ b/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/objects/CapraOfficeObject.java
@@ -103,6 +103,16 @@ } /** + * Generates a readable name for the purpose of supplying it to + * createArtifact method in the OfficeHandler. + * + * @return a readable name of the OfficeObject + */ + public String getName() { + return getFile().getName() + File.separator + getId(); + } + + /** * Extracts the ID of the object from uri of the OfficeObject. * * @param uri