Updated event handling

2 files changed, 17 insertions, 2 deletions

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
index 865a2ee4255..b16583cd1a8 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
@@ -177,7 +177,7 @@ public class FrameworkTransactionData {
     * @return true if any event was found

     */

    public boolean isHasEvent(int artId) {

-      return isChanged(artId) || isRelChange(artId) || isDeleted(artId);

+      return isChanged(artId) || isDeleted(artId) || isRelChange(artId) || isRelDeleted(artId) || isRelAdded(artId);

    }

 

    public boolean isDeleted(Artifact artifact) {

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java
index 672e2558066..97721121061 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java
@@ -761,7 +761,22 @@ public class InternalEventManager {
             RelationModifiedEvent xRelationModifiedEvent = (RelationModifiedEvent) xModifiedEvent;
             UnloadedRelation unloadedRelation = xRelationModifiedEvent.unloadedRelation;
             LoadedRelation loadedRelation = null;
-            if (unloadedRelation != null) {
+            // If link is loaded, get information from link
+            if (xRelationModifiedEvent.link != null) {
+               RelationLink link = xRelationModifiedEvent.link;
+               // Get artifact A/B if loaded in artifact cache
+               Artifact artA = ArtifactCache.getActive(link.getAArtifactId(), link.getABranch());
+               Artifact artB = ArtifactCache.getActive(link.getBArtifactId(), link.getBBranch());
+               try {
+                  loadedRelation =
+                        new LoadedRelation(artA, artB, xRelationModifiedEvent.link.getRelationType(),
+                              xRelationModifiedEvent.branch, unloadedRelation);
+               } catch (Exception ex) {
+                  OseeLog.log(SkynetActivator.class, Level.SEVERE, ex);
+               }
+            }
+            // Else, get information from unloadedRelation (if != null)
+            else if (unloadedRelation != null) {
                Artifact artA =
                      ArtifactCache.getActive(unloadedRelation.getArtifactAId(), unloadedRelation.getBranchId());
                Artifact artB =