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, 55 insertions, 0 deletions

diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/projectView/StudyDirectoryNode.java b/python/edu/learn-python/src/com/jetbrains/python/edu/projectView/StudyDirectoryNode.java
index 2f80dba12695..d8faacd23946 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/projectView/StudyDirectoryNode.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/projectView/StudyDirectoryNode.java
@@ -1,8 +1,10 @@
 package com.jetbrains.python.edu.projectView;
 
 import com.intellij.ide.projectView.PresentationData;
+import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode;
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
@@ -17,6 +19,7 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
+import java.util.Set;
 
 public class StudyDirectoryNode extends PsiDirectoryNode {
   private final PsiDirectory myValue;
@@ -110,4 +113,56 @@ public class StudyDirectoryNode extends PsiDirectoryNode {
     data.addText(additionalName, new SimpleTextAttributes(Font.PLAIN, color));
     data.setIcon(icon);
   }
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    if (myValue.getName().contains(Task.TASK_DIR)) {
+      TaskFile taskFile = null;
+      VirtualFile virtualFile =  null;
+      for (PsiElement child : myValue.getChildren()) {
+        VirtualFile childFile = child.getContainingFile().getVirtualFile();
+        taskFile = StudyTaskManager.getInstance(myProject).getTaskFile(childFile);
+        if (taskFile != null) {
+          virtualFile = childFile;
+          break;
+        }
+      }
+      if (taskFile != null) {
+        VirtualFile taskDir = virtualFile.getParent();
+        Task task = taskFile.getTask();
+        for (VirtualFile openFile : FileEditorManager.getInstance(myProject).getOpenFiles()) {
+          FileEditorManager.getInstance(myProject).closeFile(openFile);
+        }
+        VirtualFile child = null;
+        Set<String> fileNames = task.getTaskFiles().keySet();
+        for (String name : fileNames) {
+           child = taskDir.findChild(name);
+          if (child != null) {
+            FileEditorManager.getInstance(myProject).openFile(child, true);
+          }
+        }
+        if (child != null) {
+          ProjectView.getInstance(myProject).select(child, child, false);
+        }
+      }
+    }
+  }
+
+  @Override
+  public boolean expandOnDoubleClick() {
+    if (myValue.getName().contains(Task.TASK_DIR)) {
+      return false;
+    }
+    return super.expandOnDoubleClick();
+  }
 }