Cleaned up change report label

3 files changed, 34 insertions, 7 deletions

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index 0a80b43d9af..a417b4d9cb7 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.artifact;
 

 import static org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoad.FULL;

 import static org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration.DEFAULT_HIERARCHICAL__CHILD;

-

 import java.io.InputStream;

 import java.lang.reflect.Constructor;

 import java.sql.SQLException;

@@ -25,7 +24,6 @@ import java.util.List;
 import java.util.Set;

 import java.util.logging.Level;

 import java.util.regex.Pattern;

-

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.core.runtime.IExtension;

@@ -34,6 +32,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;

 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.jdk.core.util.GUID;

+import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.messaging.event.skynet.event.SkynetAttributeChange;

 import org.eclipse.osee.framework.skynet.core.SkynetActivator;

 import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;

@@ -620,7 +619,15 @@ public class Artifact implements IAdaptable, Comparable<Artifact> {
     */

    public <T> T getSoleAttributeValue(String attributeTypeName, T defaultReturnValue) throws MultipleAttributesExist, SQLException {

       try {

-         return getSoleAttributeValue(attributeTypeName);

+         T value = getSoleAttributeValue(attributeTypeName);

+         if (value == null) {

+            OseeLog.log(

+                  SkynetActivator.class,

+                  Level.SEVERE,

+                  "Attribute \"" + attributeTypeName + "\" has null value for Artifact " + getHumanReadableId() + " \"" + getDescriptiveName() + "\"");

+            return defaultReturnValue;

+         }

+         return value;

       } catch (AttributeDoesNotExist ex) {

          return defaultReturnValue;

       }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java
index 7fae41ecb6b..f9f1bcaa40a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java
@@ -23,6 +23,8 @@ import org.eclipse.jface.action.Separator;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;
+import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;
+import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.plugin.util.Jobs;
@@ -145,8 +147,17 @@ public class ChangeView extends ViewPart implements IActionable {
          this.branch = branch;
          this.transactionNumber = transactionNumber;
          xChangeViewer.setInputData(branch, transactionNumber);
-         setPartName(branch != null ? "Change Report " + branch.getBranchShortName() : "Change Report: " + BranchPersistenceManager.getInstance().getBranchForTransactionNumber(
-               transactionNumber));
+         if (branch != null) {
+            setPartName("Change Report: " + branch.getBranchShortName());
+         } else {
+            TransactionId transId =
+                  TransactionIdManager.getInstance().getPossiblyEditableTransactionId(transactionNumber);
+            if (transId != null)
+               setPartName("Change Report: " + transId.getBranch().getBranchShortestName() + " - " + transId.getComment());
+            else
+               setPartName("Change Report: " + BranchPersistenceManager.getInstance().getBranchForTransactionNumber(
+                     transactionNumber));
+         }
       }
    }
 
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java
index 3bcbe56953e..5d81138dd4e 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java
@@ -31,6 +31,7 @@ import org.eclipse.osee.framework.skynet.core.event.TransactionEvent;
 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.revision.RevisionManager;
+import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager;
 import org.eclipse.osee.framework.ui.plugin.event.Event;
 import org.eclipse.osee.framework.ui.plugin.event.IEventReceiver;
@@ -276,8 +277,16 @@ public class XChangeViewer extends XWidget implements IEventReceiver, IActionabl
                         if (changes.length == 0) {
                            extraInfoLabel.setText(NOT_CHANGES);
                         } else {
-                           extraInfoLabel.setText(hasBranch ? "Changes made to branch: " + branch.getBranchName() : "Changes made on transaction: " + transactionNumber + ", " + TransactionIdManager.getInstance().getPossiblyEditableTransactionId(
-                                 transactionNumber).getComment());
+                           TransactionId transId =
+                                 hasBranch ? null : TransactionIdManager.getInstance().getPossiblyEditableTransactionId(
+                                       transactionNumber);
+                           String infoLabel =
+                                 String.format(
+                                       "Changes %s to branch: %s\n%s",
+                                       hasBranch ? "made" : "committed",
+                                       hasBranch ? branch : "(" + transId.getTransactionNumber() + ") " + transId.getBranch(),
+                                       hasBranch ? "" : "Comment: " + transId.getComment());
+                           extraInfoLabel.setText(infoLabel);
                            xChangeViewer.setChanges(changes);
                            loadTable();
                         }