2 files changed, 13 insertions, 3 deletions

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 dc76411f3dd..fc839efd680 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
@@ -21,6 +21,8 @@ import org.eclipse.osee.framework.skynet.core.attribute.DynamicAttributeDescript
 import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionType;

+import org.eclipse.osee.framework.skynet.core.util.ArtifactDoesNotExist;

+import org.eclipse.osee.framework.skynet.core.util.MultipleArtifactsExist;

 import org.eclipse.swt.graphics.Image;

 

 /**

@@ -153,6 +155,10 @@ public class AttributeChanged extends Change {
          logger.log(Level.SEVERE, ex.toString(), ex);

       } catch (SQLException ex) {

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

+      } catch (ArtifactDoesNotExist ex) {

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

+      } catch (MultipleArtifactsExist ex) {

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

       }

       return null;

    }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
index 979a9effee1..22ba87534d5 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
@@ -14,9 +14,11 @@ package org.eclipse.osee.framework.skynet.core.change;
 import java.sql.SQLException;

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;

+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionType;

+import org.eclipse.osee.framework.skynet.core.util.ArtifactDoesNotExist;

+import org.eclipse.osee.framework.skynet.core.util.MultipleArtifactsExist;

 import org.eclipse.swt.graphics.Image;

 

 /**

@@ -73,10 +75,12 @@ public abstract class Change implements IAdaptable {
     * @return the artifact

     * @throws SQLException

     * @throws IllegalArgumentException

+    * @throws MultipleArtifactsExist

+    * @throws ArtifactDoesNotExist

     */

-   public Artifact getArtifact() throws IllegalArgumentException, SQLException {

+   public Artifact getArtifact() throws IllegalArgumentException, SQLException, ArtifactDoesNotExist, MultipleArtifactsExist {

       if (artifact == null) {

-         artifact = ArtifactPersistenceManager.getInstance().getArtifactFromId(artId, toTransactionId);

+         artifact = ArtifactQuery.getArtifactFromId(artId, toTransactionId.getBranch());

       }

       return artifact;

    }