Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormegumi.telles2016-10-11 16:51:33 +0000
committerMegumi Telles2016-10-12 18:07:08 +0000
commitd0af5599953ee6bb226731fb9fa47bd522607ebf (patch)
tree50a38ed39fda13e0971465687774e88eedb547a8 /plugins
parent45496a9945a6b1ffd406ebb81a143d7b4454ec89 (diff)
downloadorg.eclipse.osee-d0af5599953ee6bb226731fb9fa47bd522607ebf.tar.gz
org.eclipse.osee-d0af5599953ee6bb226731fb9fa47bd522607ebf.tar.xz
org.eclipse.osee-d0af5599953ee6bb226731fb9fa47bd522607ebf.zip
bug: Fix tracked changes erroneously being reported
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java36
1 files changed, 19 insertions, 17 deletions
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java
index 4ea48f7f677..061fa7e4ec8 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java
@@ -145,24 +145,26 @@ public class WordUpdateArtifact {
* at least one textual change (if the MUTI_EDIT_SAVE_ALL_CHANGES preference is not set).
*/
boolean multiSave = data.isMultiEdit() || hasChangedContent(artifact, content);
- if (!hasTrackedChanges && (singleArtifact || multiSave)) {
- if (extractorData.getParentEelement().getNodeName().endsWith("body")) {
- /*
- * This code pulls out all of the stuff after the inserted listnum reordering stuff. This needs to
- * be here so that we remove unwanted template information from single editing
- */
- content = content.replace(WordUtilities.LISTNUM_FIELD_HEAD, "");
+ if (singleArtifact || multiSave) {
+ if (!hasTrackedChanges) {
+ if (extractorData.getParentEelement().getNodeName().endsWith("body")) {
+ /*
+ * This code pulls out all of the stuff after the inserted listnum reordering stuff. This needs
+ * to be here so that we remove unwanted template information from single editing
+ */
+ content = content.replace(WordUtilities.LISTNUM_FIELD_HEAD, "");
+ }
+ LinkType linkType = LinkType.OSEE_SERVER_LINK;
+ content = WordMlLinkHandler.unlink(queryFactory, linkType, artifact, content);
+ txBuilder.setSoleAttributeValue(artifact, CoreAttributeTypes.WordTemplateContent, content);
+ artChange.setChanged(true);
+ if (!containsWordData) {
+ artChange.setCreated(true);
+ }
+ artChange.addChangedAttrType(CoreAttributeTypes.WordTemplateContent.getGuid());
+ } else {
+ updateChange.setTrackedChangeArts(artifact.getId(), artifact.getName());
}
- LinkType linkType = LinkType.OSEE_SERVER_LINK;
- content = WordMlLinkHandler.unlink(queryFactory, linkType, artifact, content);
- txBuilder.setSoleAttributeValue(artifact, CoreAttributeTypes.WordTemplateContent, content);
- artChange.setChanged(true);
- if (!containsWordData) {
- artChange.setCreated(true);
- }
- artChange.addChangedAttrType(CoreAttributeTypes.WordTemplateContent.getGuid());
- } else {
- updateChange.setTrackedChangeArts(artifact.getId(), artifact.getName());
}
if (artChange.isChanged()) {
artChange.setSafetyRelated(checkIfSafetyRelated(artifact,

Back to the top