From 7363dab9d31a288ef07f713486a16dffdf91d59b Mon Sep 17 00:00:00 2001
From: Angel Avila
Date: Mon, 28 Apr 2014 19:51:21 -0700
Subject: refactor: Add new fields to Dispo Item

Change-Id: I7442981c3597e1305a335c27d5eabfba4ca94702
---
 .../disposition/model/DispoAnnotationData.java     | 28 ++++++++++++++++++----
 .../eclipse/osee/disposition/model/DispoItem.java  |  4 ++++
 .../osee/disposition/model/DispoItemData.java      | 20 ++++++++++++++++
 3 files changed, 47 insertions(+), 5 deletions(-)

(limited to 'plugins/org.eclipse.osee.disposition.rest.model')

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 8a8cacc31f5..aef456f6fd4 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
@@ -25,12 +25,14 @@ public class DispoAnnotationData implements Identifiable<String> {
 
    private String id;
    private int index;
-   private String notes;
+   private String developerNotes;
+   private String customerNotes;
    private String locationRefs;
    private boolean isConnected;
    private JSONArray idsOfCoveredDiscrepancies;
    private String resolution;
    private boolean isResolutionValid;
+   private String resolutionType;
 
    public DispoAnnotationData() {
 
@@ -54,8 +56,12 @@ public class DispoAnnotationData implements Identifiable<String> {
       return index;
    }
 
-   public String getNotes() {
-      return notes;
+   public String getDeveloperNotes() {
+      return developerNotes;
+   }
+
+   public String getCustomerNotes() {
+      return customerNotes;
    }
 
    public String getLocationRefs() {
@@ -78,12 +84,20 @@ public class DispoAnnotationData implements Identifiable<String> {
       return isResolutionValid;
    }
 
+   public String getResolutionType() {
+      return resolutionType;
+   }
+
    public void setLocationRefs(String locationRefs) {
       this.locationRefs = locationRefs;
    }
 
-   public void setNotes(String notes) {
-      this.notes = notes;
+   public void setDeveloperNotes(String developerNotes) {
+      this.developerNotes = developerNotes;
+   }
+
+   public void setCustomerNotes(String customerNotes) {
+      this.customerNotes = customerNotes;
    }
 
    public void setId(String id) {
@@ -110,6 +124,10 @@ public class DispoAnnotationData implements Identifiable<String> {
       this.isResolutionValid = isResolutionValid;
    }
 
+   public void setResolutionType(String resolutionType) {
+      this.resolutionType = resolutionType;
+   }
+
    public void addCoveredDiscrepancyIndex(Discrepancy discrepancy) {
       idsOfCoveredDiscrepancies.put(discrepancy.getId());
    }
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItem.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItem.java
index 550d8fc9102..54dbd885792 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItem.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItem.java
@@ -32,6 +32,10 @@ public interface DispoItem extends Identifiable<String> {
 
    String getVersion();
 
+   String getTotalPoints();
+
+   Boolean getNeedsRerun();
+
    JSONObject getDiscrepanciesList();
 
    JSONArray getAnnotationsList();
diff --git a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItemData.java b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItemData.java
index a4c4f2b1def..292cab86553 100644
--- a/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItemData.java
+++ b/plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItemData.java
@@ -32,6 +32,8 @@ public class DispoItemData implements DispoItem {
    private String version;
    private JSONObject discrepanciesList;
    private JSONArray annotationsList;
+   private String totalPoints;
+   private Boolean needsRerun;
 
    public DispoItemData() {
 
@@ -82,6 +84,16 @@ public class DispoItemData implements DispoItem {
       return annotationsList;
    }
 
+   @Override
+   public String getTotalPoints() {
+      return totalPoints;
+   }
+
+   @Override
+   public Boolean getNeedsRerun() {
+      return needsRerun;
+   }
+
    public void setName(String name) {
       this.name = name;
    }
@@ -118,6 +130,14 @@ public class DispoItemData implements DispoItem {
       this.assignee = assignee;
    }
 
+   public void setTotalPoints(String totalPoints) {
+      this.totalPoints = totalPoints;
+   }
+
+   public void setNeedsRerun(boolean needsRerun) {
+      this.needsRerun = needsRerun;
+   }
+
    @Override
    public boolean matches(Identity<?>... identities) {
       for (Identity<?> identity : identities) {
-- 
cgit v1.2.3