Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbroberts2018-09-12 17:49:39 -0400
committerbroberts2018-09-12 17:49:39 -0400
commit22a6875779f78e034b4e49d901431aa79b87cc4f (patch)
treebecbe27b49b32409551826aba78a7af533afac06
parentd1b300a781c052bb3aea11c7dd6915e9bc58ba49 (diff)
downloadorg.eclipse.osee-22a6875779f78e034b4e49d901431aa79b87cc4f.tar.gz
org.eclipse.osee-22a6875779f78e034b4e49d901431aa79b87cc4f.tar.xz
org.eclipse.osee-22a6875779f78e034b4e49d901431aa79b87cc4f.zip
bug[ats_TW10661]: Add ArtifactID checkbox back into publish with specified template
Change-Id: Ib01a9f5db5d1a601a67e28bd25b1afa1ac533531 Signed-off-by: broberts <baily.e.roberts@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java6
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java
index 6391ef3083..76437c48bd 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java
@@ -86,6 +86,7 @@ public class PublishWithSpecifiedTemplate extends AbstractBlam {
private final String IS_ARTIFACTS = "IS Artifacts";
private final String PUBLISH_AS_DIFF = "Publish As Diff";
private final String WAS_BRANCH = "WAS Branch";
+ private final String INCLUDE_ARTIFACT_UUIDS = "Include Artifact UUIDs";
private final String ORCS_QUERY = "Orcs Query";
private final String VIEW = "Branch View (For IS Artifacts)";
@@ -100,6 +101,7 @@ public class PublishWithSpecifiedTemplate extends AbstractBlam {
boolean useArtifactNameInLinks = variableMap.getBoolean(USE_ARTIFACT_NAMES);
boolean useParagraphNumbersInLinks = variableMap.getBoolean(USE_PARAGRAPH_NUMBERS);
+ variableMap.getBoolean(INCLUDE_ARTIFACT_UUIDS);
if (!useParagraphNumbersInLinks && !useArtifactNameInLinks) {
throw new OseeArgumentException("Please select at least one Document Link Format");
@@ -161,6 +163,8 @@ public class PublishWithSpecifiedTemplate extends AbstractBlam {
variableMap.getBranch(WAS_BRANCH),
"Publish As Diff",
variableMap.getValue(PUBLISH_AS_DIFF),
+ "INCLUDE UUIDS",
+ variableMap.getValue(INCLUDE_ARTIFACT_UUIDS),
"linkType",
linkType,
WordTemplateRenderer.UPDATE_PARAGRAPH_NUMBER_OPTION,
@@ -285,7 +289,9 @@ public class PublishWithSpecifiedTemplate extends AbstractBlam {
builder.append(String.format(
"<xWidgets><XWidget xwidgetType=\"XCheckBox\" horizontalLabel=\"true\" labelAfter=\"true\" displayName=\"%s\" />",
UPDATE_PARAGRAPH_NUMBERS));
-
+ builder.append(String.format(
+ "<XWidget xwidgetType=\"XCheckBox\" horizontalLabel=\"true\" labelAfter=\"true\" displayName=\"%s\" />",
+ INCLUDE_ARTIFACT_UUIDS));
builder.append("<XWidget xwidgetType=\"XLabel\" displayName=\"Document Link Format:\"/>");
builder.append(String.format(
"<XWidget xwidgetType=\"XCheckBox\" horizontalLabel=\"true\" labelAfter=\"true\" displayName=\"%s\" defaultValue=\"true\"/>",
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
index 7d7a698146..274ab1d85a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
@@ -599,11 +599,17 @@ public class WordTemplateProcessor {
boolean publishInline = artifact.getSoleAttributeValue(CoreAttributeTypes.PublishInline, false);
boolean startedSection = false;
boolean templateOnly = renderer.getBooleanOption("TEMPLATE ONLY");
+ boolean includeUUIDs = renderer.getBooleanOption("INCLUDE UUIDS");
if (!ignoreArtifact && !ignoreArtType) {
if (outlining && !templateOnly) {
String headingText = artifact.getSoleAttributeValue(headingAttributeType, "");
+ if (includeUUIDs) {
+ String UUIDtext = String.format(" <UUID = %s>", artifact.getArtId());
+ headingText = headingText.concat(UUIDtext);
+ }
+
Boolean mergeTag = (Boolean) renderer.getOption(ITemplateRenderer.ADD_MERGE_TAG);
if (mergeTag != null && mergeTag) {
headingText = headingText.concat(" [MERGED]");

Back to the top