bug: Fix issues with text in the Word preference page and remove dead code

3 files changed, 12 insertions, 18 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
index 9a447572f66..42bbb7e1dfd 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/OseeLinkBuilder.java
@@ -116,15 +116,6 @@ public class OseeLinkBuilder {
          String.format("Invalid Link: artifact with guid:[%s] on branchId:[%s] does not exist", guid, branch.getId()));
    }
 
-   public boolean isEditArtifactLink(String link) {
-      return link.startsWith("http://none/edit?");
-   }
-
-   public String getEditArtifactLink(String guid, Branch branch, String message) {
-      String processType = "edit";
-      return getArtifactLinkWithMessage(processType, guid, branch, message);
-   }
-
    private String getArtifactLinkWithMessage(String processType, String guid, Branch branch, String message) {
       String internalLink = String.format("http://none/%s?guid=%s&branchId=%s", processType, guid, branch.getId());
       return String.format(WORDML_LINK_FORMAT, internalLink, message);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java
index 255c510ea8f..82e766cb2c1 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java
@@ -44,7 +44,7 @@ public class MsWordPreferencePage extends PreferencePage implements IWorkbenchPr
       identifyImageChangesInWord.setSelection(getUserBooleanSetting(IDENTFY_IMAGE_CHANGES));
 
       removeTrackedChangesInWord = new Button(parent, SWT.CHECK);
-      removeTrackedChangesInWord.setText("Do Not Remove Word Tracked Changes prior to Diffing");
+      removeTrackedChangesInWord.setText("Remove Word Tracked Changes prior to Diffing");
       removeTrackedChangesInWord.setSelection(getUserBooleanSetting(REMOVE_TRACKED_CHANGES));
 
       saveAllChanges = new Button(parent, SWT.CHECK);
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 476990ef37c..872619d4da4 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
@@ -356,7 +356,7 @@ public class WordTemplateProcessor {
          //If the artifact has not been processed
          if (!processedArtifacts.contains(artifact)) {
 
-            handleLandscapeArtifactSectionBreak(artifact, wordMl);
+            handleLandscapeArtifactSectionBreak(artifact, wordMl, multipleArtifacts);
 
             if (outlining) {
                String headingText = artifact.getSoleAttributeValue(headingAttributeType, "");
@@ -388,15 +388,18 @@ public class WordTemplateProcessor {
       }
    }
 
-   private void handleLandscapeArtifactSectionBreak(Artifact artifact, WordMLProducer wordMl) throws OseeCoreException {
+   private void handleLandscapeArtifactSectionBreak(Artifact artifact, WordMLProducer wordMl, boolean multipleArtifacts) throws OseeCoreException {
       String pageTypeValue = null;
-      if (artifact.isAttributeTypeValid(CoreAttributeTypes.PageType)) {
-         pageTypeValue = artifact.getSoleAttributeValue(CoreAttributeTypes.PageType, "Portrait");
-      }
-      boolean landscape = pageTypeValue != null && pageTypeValue.equals("Landscape");
+      //There is no reason to add an additional page break if there is a single artifacts
+      if (multipleArtifacts) {
+         if (artifact.isAttributeTypeValid(CoreAttributeTypes.PageType)) {
+            pageTypeValue = artifact.getSoleAttributeValue(CoreAttributeTypes.PageType, "Portrait");
+         }
+         boolean landscape = pageTypeValue != null && pageTypeValue.equals("Landscape");
 
-      if (landscape) {
-         wordMl.setPageBreak();
+         if (landscape) {
+            wordMl.setPageBreak();
+         }
       }
    }