Convert to use folder artifact type instead of coverage.Folder attribute

4 files changed, 10 insertions, 9 deletions

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java
index 9976ccc9ea2..f895b62ba8f 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactImageProvider.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.coverage.store;
 import org.eclipse.osee.coverage.util.CoverageImage;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider;
+import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.ImageManager;
 
 /**
@@ -24,6 +25,7 @@ public class CoverageArtifactImageProvider extends ArtifactImageProvider {
    public void init() throws OseeCoreException {
       ImageManager.registerBaseImage(OseeCoveragePackageStore.ARTIFACT_NAME, CoverageImage.COVERAGE_PACKAGE, this);
       ImageManager.registerBaseImage(OseeCoverageUnitStore.ARTIFACT_NAME, CoverageImage.COVERAGE, this);
+      ImageManager.registerBaseImage(OseeCoverageUnitStore.ARTIFACT_FOLDER_NAME, FrameworkImage.FOLDER, this);
    }
 
 }
\ No newline at end of file
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributes.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributes.java
index a2e8183f685..2c0a46ddd30 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributes.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributes.java
@@ -28,7 +28,6 @@ public class CoverageAttributes {
    public static final CoverageAttributes ACTIVE = new CoverageAttributes(Namespace.None, "Active");
 
    public static final CoverageAttributes NOTES = new CoverageAttributes(Namespace.Coverage, "Notes");
-   public static final CoverageAttributes FOLDER = new CoverageAttributes(Namespace.Coverage, "Folder");
    public static final CoverageAttributes FILE_CONTENTS = new CoverageAttributes(Namespace.Coverage, "File Contents");
    public static final CoverageAttributes ASSIGNEES = new CoverageAttributes(Namespace.Coverage, "Assignees");
    public static final CoverageAttributes NAMESPACE = new CoverageAttributes(Namespace.Coverage, "Namespace");
diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java
index bd3050b7bc7..80459152f64 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java
@@ -52,7 +52,8 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave
          coveragePackage.setName(artifact.getName());

          coveragePackage.setEditable(artifact.getSoleAttributeValue(CoverageAttributes.ACTIVE.getStoreName(), true));

          for (Artifact childArt : artifact.getChildren()) {

-            if (childArt.getArtifactTypeName().equals(OseeCoverageUnitStore.ARTIFACT_NAME)) {

+            if (childArt.getArtifactTypeName().equals(OseeCoverageUnitStore.ARTIFACT_NAME) || childArt.getArtifactTypeName().equals(

+                  OseeCoverageUnitStore.ARTIFACT_FOLDER_NAME)) {

                coveragePackage.addCoverageUnit(OseeCoverageUnitStore.get(coveragePackage, childArt));

             }

          }

diff --git a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java
index 00883cb9147..0dc787eedd0 100644
--- a/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java
+++ b/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageUnitStore.java
@@ -24,17 +24,18 @@ import org.eclipse.osee.framework.ui.plugin.util.Result;
 public class OseeCoverageUnitStore extends OseeCoverageStore {

 

    public static String ARTIFACT_NAME = "Coverage Unit";

+   public static String ARTIFACT_FOLDER_NAME = "Coverage Folder";

    private final CoverageUnit coverageUnit;

 

    public OseeCoverageUnitStore(ICoverage parent, Artifact artifact) throws OseeCoreException {

-      super(null, ARTIFACT_NAME);

+      super(null, artifact.getArtifactTypeName());

       this.artifact = artifact;

       this.coverageUnit = new CoverageUnit(parent, artifact.getName(), "");

       load();

    }

 

    public OseeCoverageUnitStore(CoverageUnit coverageUnit) {

-      super(coverageUnit, ARTIFACT_NAME);

+      super(coverageUnit, coverageUnit.isFolder() ? ARTIFACT_FOLDER_NAME : ARTIFACT_NAME);

       this.coverageUnit = coverageUnit;

    }

 

@@ -68,14 +69,15 @@ public class OseeCoverageUnitStore extends OseeCoverageStore {
          coverageUnit.setFileContents(artifact.getSoleAttributeValueAsString(

                CoverageAttributes.FILE_CONTENTS.getStoreName(), ""));

          coverageUnit.setNotes(artifact.getSoleAttributeValueAsString(CoverageAttributes.NOTES.getStoreName(), ""));

-         coverageUnit.setFolder(artifact.getSoleAttributeValue(CoverageAttributes.FOLDER.getStoreName(), false));

+         coverageUnit.setFolder(artifact.getArtifactTypeName().equals(ARTIFACT_FOLDER_NAME));

          coverageUnit.setAssignees(artifact.getSoleAttributeValueAsString(CoverageAttributes.ASSIGNEES.getStoreName(),

                ""));

          coverageUnit.setNamespace(artifact.getSoleAttributeValueAsString(CoverageAttributes.NAMESPACE.getStoreName(),

                ""));

          coverageUnit.setLocation(artifact.getSoleAttributeValueAsString(CoverageAttributes.LOCATION.getStoreName(), ""));

          for (Artifact childArt : artifact.getChildren()) {

-            if (childArt.getArtifactTypeName().equals(ARTIFACT_NAME)) {

+            if (childArt.getArtifactTypeName().equals(ARTIFACT_NAME) || childArt.getArtifactTypeName().equals(

+                  ARTIFACT_FOLDER_NAME)) {

                coverageUnit.addCoverageUnit(OseeCoverageUnitStore.get(coverageUnit, childArt));

             }

          }

@@ -101,9 +103,6 @@ public class OseeCoverageUnitStore extends OseeCoverageStore {
          artifact.setSoleAttributeFromString(CoverageAttributes.FILE_CONTENTS.getStoreName(),

                coverageUnit.getFileContents());

       }

-      if (coverageUnit.isFolder()) {

-         artifact.setSoleAttributeValue(CoverageAttributes.FOLDER.getStoreName(), coverageUnit.isFolder());

-      }

       if (Strings.isValid(coverageUnit.getAssignees())) {

          artifact.setSoleAttributeFromString(CoverageAttributes.ASSIGNEES.getStoreName(), coverageUnit.getAssignees());

       }