bug[ats_R16MM]: Word Change Report on New/Deleted artifacts causes error

3 files changed, 35 insertions, 14 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java
index 0e8e0e074cc..17f02162f97 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java
@@ -111,23 +111,30 @@ public final class RenderingUtil {
          name.append("_");
       }
 
-      Artifact artifact = artifacts.iterator().next();
-      name.append(artifact.getSafeName());
-
-      if (artifact.isHistorical() || presentationType == PresentationType.DIFF) {
-         name.append("_");
-         name.append(artifact.getTransactionNumber());
-      }
-      if (artifacts.size() > 1) {
-         name.append("_multi");
+      Artifact artifact = null;
+      if (!artifacts.isEmpty()) {
+         artifact = artifacts.iterator().next();
+         name.append(artifact.getSafeName());
+
+         if (artifact.isHistorical() || presentationType == PresentationType.DIFF) {
+            name.append("_");
+            name.append(artifact.getTransactionNumber());
+         }
+         if (artifacts.size() > 1) {
+            name.append("_multi");
+         }
       }
 
       name.append("_");
       name.append(dateFormat.format(new Date()));
       name.append("-");
       name.append(generator.nextInt(99) + 1);
-      name.append(".");
-      name.append(renderer.getAssociatedExtension(artifact));
+      if (artifact != null) {
+         name.append(".");
+         name.append(renderer.getAssociatedExtension(artifact));
+      } else {
+         name.append(".xml");
+      }
       return name.toString();
    }
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java
index d10740bc42b..b9a5c5dea6a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java
@@ -57,7 +57,12 @@ public abstract class AbstractWordCompare implements IComparator {
       IVbaDiffGenerator diffGenerator = WordUiUtil.createScriptGenerator();
       diffGenerator.initialize(show, presentationType == PresentationType.MERGE);
       String diffPath = addTocompare(monitor, diffGenerator, presentationType, artifactDelta);
-      finish(diffGenerator, artifactDelta.getStartArtifact().getBranch(), presentationType);
+
+      Artifact testArtifact = artifactDelta.getStartArtifact();
+      if (testArtifact == null) {
+         testArtifact = artifactDelta.getEndArtifact();
+      }
+      finish(diffGenerator, testArtifact.getBranch(), presentationType);
       return diffPath;
    }
 
@@ -72,8 +77,9 @@ public abstract class AbstractWordCompare implements IComparator {
    }
 
    protected String addTocompare(IVbaDiffGenerator diffGenerator, Artifact baseVersion, Artifact newerVersion, IFile baseFile, IFile newerFile, PresentationType presentationType) throws OseeCoreException {
+      Artifact testArtifact = baseVersion != null ? baseVersion : newerVersion;
       String diffPath =
-         RenderingUtil.getRenderFile(renderer, Collections.singletonList(baseVersion), baseVersion.getBranch(),
+         RenderingUtil.getRenderFile(renderer, Collections.singletonList(testArtifact), testArtifact.getBranch(),
             presentationType).getLocation().toOSString();
 
       diffGenerator.addComparison(baseFile, newerFile, diffPath, presentationType == PresentationType.MERGE);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java
index 73be7371201..2ba4e7765e8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer;
@@ -57,6 +58,13 @@ public class WordTemplateCompare extends AbstractWordCompare {
          throw new OperationCanceledException();
       }
 
-      finish(diffGenerator, artifactDeltas.iterator().next().getStartArtifact().getBranch(), presentationType);
+      if (!artifactDeltas.isEmpty()) {
+         ArtifactDelta artifactDelta1 = artifactDeltas.iterator().next();
+         Artifact testArtifact = artifactDelta1.getStartArtifact();
+         if (testArtifact == null) {
+            testArtifact = artifactDelta1.getEndArtifact();
+         }
+         finish(diffGenerator, testArtifact.getBranch(), presentationType);
+      }
    }
 }
\ No newline at end of file