MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EDU-407 Files created by user code are invisible

Browse Source
This commit is contained in:
liana.bakradze
2015-08-25 19:44:43 +03:00
parent 3ef6388d96
commit 8bd481f989
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyTaskManager.java
+9
View File
@@ -36,6 +36,7 @@ public class StudyTaskManager implements PersistentStateComponent<StudyTaskManag
public Map<AnswerPlaceholder, StudyStatus> myStudyStatusMap = new HashMap<AnswerPlaceholder, StudyStatus>();
public Map<TaskFile, StudyStatus> myTaskStatusMap = new HashMap<TaskFile, StudyStatus>();
public Map<Task, List<UserTest>> myUserTests = new HashMap<Task, List<UserTest>>();
public List<String> myInvisibleFiles = new ArrayList<String>();
private StudyTaskManager() {
}
@@ -184,4 +185,12 @@ public class StudyTaskManager implements PersistentStateComponent<StudyTaskManag
public static StudyTaskManager getInstance(@NotNull final Project project) {
return ServiceManager.getService(project, StudyTaskManager.class);
}
public void addInvisibleFiles(String filePath) {
myInvisibleFiles.add(filePath);
}
public boolean isInvisibleFile(String path) {
return myInvisibleFiles.contains(path);
}
}
python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
+1
View File
@@ -80,6 +80,7 @@ public class StudyRunAction extends DumbAwareAction {
Disposer.register(project, executor);
executor.run();
}
EduUtils.synchronize();
}
}
python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
+2
View File
@@ -9,6 +9,7 @@ import com.jetbrains.edu.courseFormat.Course;
import com.jetbrains.edu.courseFormat.Lesson;
import com.jetbrains.edu.courseFormat.Task;
import com.jetbrains.edu.courseFormat.TaskFile;
import com.jetbrains.edu.learning.StudyTaskManager;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -68,6 +69,7 @@ public class StudyGenerator {
File resourceFile = new File(newResourceRoot, fileName);
File fileInProject = new File(taskDir.getCanonicalPath(), fileName);
FileUtil.copy(resourceFile, fileInProject);
StudyTaskManager.getInstance(project).addInvisibleFiles(fileInProject.getPath());
}
}
}
python/educational/interactive-learning/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
+15
View File
@@ -54,6 +54,9 @@ public class StudyTreeStructureProvider implements TreeStructureProvider, DumbAw
if (parentName.equals(EduNames.SANDBOX_DIR)) {
nodes.add(node);
}
if (parentName.startsWith(EduNames.TASK)) {
addNonInvisibleFiles(nodes, node, project, virtualFile);
}
}
}
}
@@ -62,6 +65,18 @@ public class StudyTreeStructureProvider implements TreeStructureProvider, DumbAw
return nodes;
}
private static void addNonInvisibleFiles(@NotNull final Collection<AbstractTreeNode> nodes,
@NotNull final AbstractTreeNode node,
@NotNull final Project project,
@NotNull final VirtualFile virtualFile) {
if (!StudyTaskManager.getInstance(project).isInvisibleFile(virtualFile.getPath())) {
String fileName = virtualFile.getName();
if (!fileName.contains(EduNames.WINDOW_POSTFIX) && !fileName.contains(EduNames.WINDOWS_POSTFIX)) {
nodes.add(node);
}
}
}
protected boolean isCourseBasedProject(@NotNull final AbstractTreeNode parent) {
final Project project = parent.getProject();
if (project != null) {