Merged with master

src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phases/Task.java

@@ -27,7 +27,7 @@ public class Task implements Serializable {
     private String answer;
     private String solution;
     private int incorrectAnswerLimit;
-    private boolean modifiedSandbox;
+    private boolean modifySandbox;
     private int sandboxChangeExpectedDuration;
 
     @Column(name = "order_in_training_phase", nullable = false)
@@ -100,12 +100,12 @@ public class Task implements Serializable {
         this.trainingPhase = trainingPhase;
     }
 
-    public boolean isModifiedSandbox() {
-        return modifiedSandbox;
+    public boolean isModifySandbox() {
+        return modifySandbox;
     }
 
-    public void setModifiedSandbox(boolean modifiedSandbox) {
-        this.modifiedSandbox = modifiedSandbox;
+    public void setModifySandbox(boolean modifySandbox) {
+        this.modifySandbox = modifySandbox;
     }
 
     public int getSandboxChangeExpectedDuration() {
@@ -125,7 +125,7 @@ public class Task implements Serializable {
                 ", answer='" + answer + '\'' +
                 ", solution='" + solution + '\'' +
                 ", incorrectAnswerLimit=" + incorrectAnswerLimit +
-                ", isSandboxModified=" + modifiedSandbox +
+                ", modifySandbox=" + modifySandbox +
                 ", sandboxChangeExpectedDuration=" + sandboxChangeExpectedDuration +
                 ", order=" + order +
                 ", trainingPhase=" + trainingPhase.getId() +

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskCopyDTO.java

@@ -30,7 +30,7 @@ public class TaskCopyDTO {
     private Integer incorrectAnswerLimit;
 
     @ApiModelProperty(value = "It defines whether the sandbox can be modified", example = "true")
-    private boolean isSandboxModified;
+    private boolean modifySandbox;
 
     @ApiModelProperty(value = "It defines the expected duration of sandbox change defined in seconds", example = "15")
     @PositiveOrZero(message = "Estimated duration of sandbox change must not be a negative number")
@@ -76,12 +76,12 @@ public class TaskCopyDTO {
         this.incorrectAnswerLimit = incorrectAnswerLimit;
     }
 
-    public boolean isSandboxModified() {
-        return isSandboxModified;
+    public boolean isModifySandbox() {
+        return modifySandbox;
     }
 
-    public void setSandboxModified(boolean sandboxModified) {
-        isSandboxModified = sandboxModified;
+    public void setModifySandbox(boolean modifySandbox) {
+        this.modifySandbox = modifySandbox;
     }
 
     public int getSandboxChangeExpectedDuration() {
@@ -100,7 +100,7 @@ public class TaskCopyDTO {
                 ", answer='" + answer + '\'' +
                 ", solution='" + solution + '\'' +
                 ", incorrectAnswerLimit=" + incorrectAnswerLimit +
-                ", isSandboxModified=" + isSandboxModified +
+                ", modifySandbox=" + modifySandbox +
                 ", sandboxChangeExpectedDuration=" + sandboxChangeExpectedDuration +
                 '}';
     }

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java

@@ -9,7 +9,7 @@ public class TaskDTO {
     private String answer;
     private String solution;
     private int incorrectAnswerLimit;
-    private boolean isSandboxModified;
+    private boolean modifySandbox;
     private int sandboxChangeExpectedDuration;
 
     public Long getId() {
@@ -68,12 +68,12 @@ public class TaskDTO {
         this.incorrectAnswerLimit = incorrectAnswerLimit;
     }
 
-    public boolean isSandboxModified() {
-        return isSandboxModified;
+    public boolean isModifySandbox() {
+        return modifySandbox;
     }
 
-    public void setSandboxModified(boolean sandboxModified) {
-        isSandboxModified = sandboxModified;
+    public void setModifySandbox(boolean modifySandbox) {
+        this.modifySandbox = modifySandbox;
     }
 
     public int getSandboxChangeExpectedDuration() {
@@ -94,7 +94,7 @@ public class TaskDTO {
                 ", answer='" + answer + '\'' +
                 ", solution='" + solution + '\'' +
                 ", incorrectAnswerLimit=" + incorrectAnswerLimit +
-                ", isSandboxModified=" + isSandboxModified +
+                ", modifySandbox=" + modifySandbox +
                 ", sandboxChangeExpectedDuration=" + sandboxChangeExpectedDuration +
                 '}';
     }

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java

@@ -30,7 +30,7 @@ public class TaskUpdateDTO {
     private Integer incorrectAnswerLimit;
 
     @ApiModelProperty(value = "It defines whether the sandbox can be modified", example = "true")
-    private boolean isSandboxModified;
+    private boolean modifySandbox;
 
     @ApiModelProperty(value = "It defines the expected duration of sandbox change defined in seconds", example = "15")
     @PositiveOrZero(message = "Estimated duration of sandbox change must not be a negative number")
@@ -76,12 +76,12 @@ public class TaskUpdateDTO {
         this.incorrectAnswerLimit = incorrectAnswerLimit;
     }
 
-    public boolean isSandboxModified() {
-        return isSandboxModified;
+    public boolean isModifySandbox() {
+        return modifySandbox;
     }
 
-    public void setSandboxModified(boolean sandboxModified) {
-        isSandboxModified = sandboxModified;
+    public void setModifySandbox(boolean modifySandbox) {
+        this.modifySandbox = modifySandbox;
     }
 
     public int getSandboxChangeExpectedDuration() {
@@ -100,7 +100,7 @@ public class TaskUpdateDTO {
                 ", answer='" + answer + '\'' +
                 ", solution='" + solution + '\'' +
                 ", incorrectAnswerLimit=" + incorrectAnswerLimit +
-                ", isSandboxModified=" + isSandboxModified +
+                ", modifySandbox=" + modifySandbox +
                 ", sandboxChangeExpectedDuration=" + sandboxChangeExpectedDuration +
                 '}';
     }