Refactored CanBeRelocated and added field Priority. Priority will replace profit in a future version. Profit is deprecated from now on.

Author: Jarkko Laitinen

fi/cosky/sdk/TaskData.java

@@ -18,12 +18,17 @@ public class TaskData extends BaseData {
     private int VersionNumber;
     private List<String> IncompatibleVehicleTypes;
     private List<String> CompatibleVehicleTypes;
+    
+    //Profit will be removed at some point, use Priority.
+    @Deprecated
     private double Profit;
-    private String CanBeRelocated;
+    
+    private double Priority;
+    private String RelocationType;
     private String ActivityState;
 
     public TaskData() {
-    	this.CanBeRelocated = "None";
+    	this.RelocationType = "None";
     	this.ActivityState = "Active"; // other possibility is "Inactive"
     }
 
@@ -95,14 +100,6 @@ public void setProfit(double profit) {
 		Profit = profit;
 	}
 
-	public String getCanBeRelocated() {
-		return CanBeRelocated;
-	}
-
-	public void setCanBeRelocated(String canBeRelocated) {
-		CanBeRelocated = canBeRelocated;
-	}
-
 	public String getActivityState() {
 		return ActivityState;
 	}
@@ -111,6 +108,22 @@ public void setActivityState(String activityState) {
 		ActivityState = activityState;
 	}
 
+	public double getPriority() {
+		return Priority;
+	}
+
+	public void setPriority(double priority) {
+		Priority = priority;
+	}
+
+	public String getRelocationType() {
+		return RelocationType;
+	}
+
+	public void setRelocationType(String relocationType) {
+		RelocationType = relocationType;
+	}
+
 	public TaskUpdateRequest toRequest() {
 		List<TaskEventUpdateRequest> taskevents = new ArrayList<TaskEventUpdateRequest>();
 
@@ -123,7 +136,7 @@ public TaskUpdateRequest toRequest() {
 		update.setName(Name);
 		update.setVersionNumber(VersionNumber);
 		update.setTaskId(Id);
-		update.setCanBeRelocated(CanBeRelocated);
+		update.setRelocationType(RelocationType);
 		update.setActivityState(ActivityState);
 		return update;
 	}

fi/cosky/sdk/TaskUpdateRequest.java

@@ -19,18 +19,22 @@ public class TaskUpdateRequest extends BaseData {
     private int UserId;
     private List<String> IncompatibleVehicleTypes;
     private List<String> CompatibleVehicleTypes;
+    
+    @Deprecated
     private double Profit;
-    private String CanBeRelocated;
+    
+    private double Priority;
+    private String RelocationType;
     private String ActivityState;
 
 
     public TaskUpdateRequest(List<TaskEventUpdateRequest> taskEvents) {
         this.TaskEvents = taskEvents;
-    	this.CanBeRelocated = "None";
+    	this.RelocationType = "None";
     }
 
     public TaskUpdateRequest() {
-    	this.CanBeRelocated = "None";
+    	this.RelocationType = "None";
     }
 
     public String getInfo() {
@@ -105,7 +109,6 @@ public void setTaskEvents(List<TaskEventUpdateRequest> taskEvents) {
         TaskEvents = taskEvents;
     }
 
-
     public double getProfit() {
 		return Profit;
 	}
@@ -114,14 +117,6 @@ public void setProfit(double profit) {
 		Profit = profit;
 	}
 
-	public String getCanBeRelocated() {
-		return CanBeRelocated;
-	}
-
-	public void setCanBeRelocated(String canBeRelocated) {
-		CanBeRelocated = canBeRelocated;
-	}
-
 	public String getActivityState() {
 		return ActivityState;
 	}
@@ -130,5 +125,21 @@ public void setActivityState(String activityState) {
 		ActivityState = activityState;
 	}
 
+	public double getPriority() {
+		return Priority;
+	}
+
+	public void setPriority(double priority) {
+		Priority = priority;
+	}
+
+	public String getRelocationType() {
+		return RelocationType;
+	}
+
+	public void setRelocationType(String relocationType) {
+		RelocationType = relocationType;
+	}
+
 
 }