Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2014-04-28 22:51:21 -0400
committerAngel Avila2014-05-07 15:53:56 -0400
commit7363dab9d31a288ef07f713486a16dffdf91d59b (patch)
tree6018a2963ffb8e86e16afc43efd05f6eaee52e1a /plugins/org.eclipse.osee.disposition.rest.model
parent8e87cfbf77f64b46d2addfef38abd250f05b0100 (diff)
downloadorg.eclipse.osee-7363dab9d31a288ef07f713486a16dffdf91d59b.tar.gz
org.eclipse.osee-7363dab9d31a288ef07f713486a16dffdf91d59b.tar.xz
org.eclipse.osee-7363dab9d31a288ef07f713486a16dffdf91d59b.zip
refactor: Add new fields to Dispo Item
Diffstat (limited to 'plugins/org.eclipse.osee.disposition.rest.model')
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoAnnotationData.java28
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItem.java4
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.model/src/org/eclipse/osee/disposition/model/DispoItemData.java20
3 files changed, 47 insertions, 5 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 8a8cacc31f..aef456f6fd 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 550d8fc910..54dbd88579 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 a4c4f2b1de..292cab8655 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) {

Back to the top