3 files changed, 9 insertions, 3 deletions

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChanged.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChanged.java
index ea7c6b56f6e..67dd332c366 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChanged.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/ArtifactChanged.java
@@ -124,7 +124,7 @@ public class ArtifactChanged extends Change {
             return getArtifactChange();

          }

          if (adapter.isInstance(getArtifact())) {

-            return getArtifact();

+            return getArtifactChange().getArtifact();

          }

       } catch (IllegalArgumentException ex) {

          logger.log(Level.SEVERE, ex.toString(), ex);

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChanged.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChanged.java
index e8d0ca0a842..b664f3de0e6 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChanged.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/AttributeChanged.java
@@ -158,7 +158,7 @@ public class AttributeChanged extends Change {
             return getArtifactChange();

          }

          if (adapter.isInstance(getArtifact())) {

-            return getArtifact();

+            return getArtifactChange().getArtifact();

          }

       } catch (IllegalArgumentException ex) {

          logger.log(Level.SEVERE, ex.toString(), ex);

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java
index c229a3bf375..c4fbead9f03 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java
@@ -12,12 +12,15 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xchange;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.change.Change;
 import org.eclipse.osee.framework.skynet.core.event.BranchEvent;
@@ -56,8 +59,11 @@ public class ChangeXViewer extends XViewer implements IEventReceiver {
 
    public void handleDoubleClick() throws Exception {
       if (getSelectedChanges().size() == 0) return;
+      
+      
       Change change = getSelectedChanges().iterator().next();
-      ArtifactEditor.editArtifact(change.getArtifact());
+      Artifact artifact = (Artifact)((IAdaptable) change).getAdapter(Artifact.class);
+      ArtifactEditor.editArtifact(artifact);
    }
 
    public ArrayList<Change> getSelectedChanges() {