feature[ats_ATS105873]: Coverage Import calls Dispo API

Change-Id: Ibbdf1affef100abc7def7633880ca8d0dc3ca256

4 files changed, 11 insertions, 13 deletions

diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoAnnotationData.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoAnnotationData.java
index ba9edbd07f5..a8c05b2cc82 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoAnnotationData.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoAnnotationData.java
@@ -33,6 +33,7 @@ public class DispoAnnotationData implements Identifiable<String> {
    private String resolution;
    private boolean isResolutionValid;
    private String resolutionType;
+   private boolean isDefault;
 
    public DispoAnnotationData() {
 
@@ -88,6 +89,10 @@ public class DispoAnnotationData implements Identifiable<String> {
       return resolutionType;
    }
 
+   public boolean getIsDefault() {
+      return isDefault;
+   }
+
    public void setLocationRefs(String locationRefs) {
       this.locationRefs = locationRefs;
    }
@@ -128,8 +133,8 @@ public class DispoAnnotationData implements Identifiable<String> {
       this.resolutionType = resolutionType;
    }
 
-   public void addCoveredDiscrepancyIndex(Discrepancy discrepancy) {
-      idsOfCoveredDiscrepancies.put(discrepancy.getId());
+   public void setIsDefault(boolean isDefault) {
+      this.isDefault = isDefault;
    }
 
    public boolean isValid() {
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSet.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSet.java
index 8846e5a3164..9e2182a12c0 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSet.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSet.java
@@ -26,5 +26,5 @@ public interface DispoSet extends Identifiable<String> {
 
    String getImportState();
 
-   DispoConfig getDispoConfig();
+   String getDispoType();
 }
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSetData.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSetData.java
index e777a013e03..2a7b923c2e0 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSetData.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoSetData.java
@@ -26,7 +26,6 @@ public class DispoSetData extends DispoSetDescriptorData implements DispoSet {
    private String operation;
    private JSONArray notesList;
    private String importState;
-   private DispoConfig dispoConfig;
 
    public DispoSetData() {
 
@@ -53,10 +52,6 @@ public class DispoSetData extends DispoSetDescriptorData implements DispoSet {
       this.notesList = notesList;
    }
 
-   public void setDispoConfig(DispoConfig dispoConfig) {
-      this.dispoConfig = dispoConfig;
-   }
-
    @Override
    public JSONArray getNotesList() {
       return notesList;
@@ -80,9 +75,4 @@ public class DispoSetData extends DispoSetDescriptorData implements DispoSet {
       }
       return false;
    }
-
-   @Override
-   public DispoConfig getDispoConfig() {
-      return dispoConfig;
-   }
 }
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java
index 4d56bad5ef2..aeea6fd40ab 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoStrings.java
@@ -49,4 +49,7 @@ public class DispoStrings {
    public static final String DeletedDiscrepancy = "Deleted Discrepancy";
 
    public static final String Dispo_Config_Art = "Dispo_Config";
+
+   public static final String Test_Unit_Resolution = "Test_Script";
+   public static final String Exception_Handling_Resolution = "Exception_Handling";
 }