Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 18 insertions, 9 deletions

diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
index 85f0d91983f2..b88e375bc265 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskFile.java
@@ -13,15 +13,6 @@ import java.util.List;
 public class TaskFile {
   @Expose public List<TaskWindow> task_windows = new ArrayList<TaskWindow>();
   public int myIndex;
-  public boolean myTrackChanges = true;
-
-  public boolean isTrackChanges() {
-    return myTrackChanges;
-  }
-
-  public void setTrackChanges(boolean trackChanges) {
-    myTrackChanges = trackChanges;
-  }
 
   public TaskFile() {}
 
@@ -108,4 +99,22 @@ public class TaskFile {
       }
     }
   }
+
+  public void copy(@NotNull final TaskFile target) {
+    target.setIndex(myIndex);
+    for (TaskWindow taskWindow : task_windows) {
+      TaskWindow savedWindow = new TaskWindow(taskWindow.getLine(), taskWindow.getStart(),
+                                    taskWindow.getLength(), "");
+      target.getTaskWindows().add(savedWindow);
+      savedWindow.setIndex(taskWindow.getIndex());
+    }
+  }
+
+  public void update(@NotNull final TaskFile source) {
+    for (TaskWindow taskWindow : source.getTaskWindows()) {
+      TaskWindow taskWindowUpdated = task_windows.get(taskWindow.getIndex() - 1);
+      taskWindowUpdated.setLine(taskWindow.getLine());
+      taskWindowUpdated.setStart(taskWindow.getStart());
+    }
+  }
 }