Simplified ArtifactLoader logic

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
index 465cff17695..39dca2d5c43 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java
@@ -105,7 +105,7 @@ public final class ArtifactLoader {
                // assumption: sql is returning rows ordered by branch_id, art_id, transaction_id in descending order

                if (previousArtId != artId || previousBranchId != branchId) {

                   // assumption: sql is returning unwanted deleted artifacts only in the historical case

-                  if (!(historical && !allowDeleted && ModificationType.getMod(chStmt.getInt("mod_type")) == ModificationType.DELETED)) {

+                  if (!historical || allowDeleted || ModificationType.getMod(chStmt.getInt("mod_type")) != ModificationType.DELETED) {

                      loadedItems.add(retrieveShallowArtifact(chStmt, reload, historical));

                   }

                }

@@ -176,7 +176,7 @@ public final class ArtifactLoader {
          if (loadedItems.isEmpty()) {

             data = loadedItems;

          } else {

-            // Use a new list if loaded items already contains data to prevent artifact overwrites during loading;

+            // Use a new list if loaded items already contains data to prevent artifact overwrites during loading

             data = new ArrayList<Artifact>(insertParameters.size());

          }

          long time = System.currentTimeMillis();

@@ -211,7 +211,7 @@ public final class ArtifactLoader {
 

    /**

     * should only be used in tandem with with selectArtifacts()

-    *
+    * 

     * @param queryId value gotten from call to getNewQueryId and used in populating the insert parameters for

     *           selectArtifacts

     */

@@ -221,7 +221,7 @@ public final class ArtifactLoader {
 

    /**

     * should only be used in tandem with with selectArtifacts()

-    *
+    * 

     * @param queryId value gotten from call to getNewQueryId and used in populating the insert parameters for

     *           selectArtifacts

     */

@@ -317,7 +317,7 @@ public final class ArtifactLoader {
       }

 

       AttributeLoader.loadAttributeData(queryId, artifacts, historical, allowDeleted, loadLevel);

-      RelationLoader.loadRelationData(queryId, artifacts, historical, loadLevel);
+      RelationLoader.loadRelationData(queryId, artifacts, historical, loadLevel);

 

       for (Artifact artifact : artifacts) {

          artifact.onInitializationComplete();