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

proper separator for task file path

Browse Source
This commit is contained in:
Ekaterina Tuzova
2016-11-25 18:24:24 +03:00
parent 86cba1b8e1
commit eaa6999da6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
+1 -1
View File
@@ -345,7 +345,7 @@ public class StudyProjectComponent implements ProjectComponent {
final TaskFile taskFile = new TaskFile();
taskFile.initTaskFile(task, false);
taskFile.setUserCreated(true);
final String name = FileUtil.getRelativePath(taskDir.getPath(), createdFile.getPath(), File.separatorChar);
final String name = FileUtil.getRelativePath(taskDir.getPath(), createdFile.getPath(), '/');
taskFile.name = name;
//TODO: put to other steps as well
task.getTaskFiles().put(name, taskFile);
python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
+1 -1
View File
@@ -814,6 +814,6 @@ public class StudyUtils {
public static String pathRelativeToTask(VirtualFile file) {
VirtualFile taskDir = getTaskDir(file);
if (taskDir == null) return file.getName();
return FileUtil.getRelativePath(taskDir.getPath(), file.getPath(), File.separatorChar);
return FileUtil.getRelativePath(taskDir.getPath(), file.getPath(), '/');
}
}
python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
+3 -3
View File
@@ -180,10 +180,10 @@ public class StudyProjectGenerator {
final Map<String, TaskFile> taskFiles = firstTask.getTaskFiles();
VirtualFile activeVirtualFile = null;
for (Map.Entry<String, TaskFile> entry : taskFiles.entrySet()) {
final String name = entry.getKey();
final String relativePath = entry.getKey();
final TaskFile taskFile = entry.getValue();
taskDir.refresh(false, true);
final VirtualFile virtualFile = VfsUtil.findRelativeFile(taskDir, name);
final VirtualFile virtualFile = VfsUtil.findRelativeFile(taskDir, relativePath.split("/"));
if (virtualFile != null) {
FileEditorManager.getInstance(project).openFile(virtualFile, true);
if (!taskFile.getActivePlaceholders().isEmpty()) {
@@ -272,7 +272,7 @@ public class StudyProjectGenerator {
public static void flushTask(@NotNull final Task task, @NotNull final File taskDirectory) {
FileUtil.createDirectory(taskDirectory);
for (Map.Entry<String, TaskFile> taskFileEntry : task.taskFiles.entrySet()) {
final String name = taskFileEntry.getKey();
final String name = FileUtil.toSystemDependentName(taskFileEntry.getKey());
final TaskFile taskFile = taskFileEntry.getValue();
final File file = new File(taskDirectory, name);
FileUtil.createIfDoesntExist(file);
python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java
+1 -1
View File
@@ -289,7 +289,7 @@ public class EduAdaptiveStepicConnector {
File[] filesInTask = newResourceRoot.listFiles();
if (filesInTask != null) {
for (File file : filesInTask) {
String taskRelativePath = FileUtil.getRelativePath(taskDir.getPath(), file.getPath(), File.separatorChar);
String taskRelativePath = FileUtil.getRelativePath(taskDir.getPath(), file.getPath(), '/');
if (taskRelativePath != null && !task.isTaskFile(taskRelativePath)) {
File resourceFile = new File(newResourceRoot, taskRelativePath);
File fileInProject = new File(taskDir.getCanonicalPath(), taskRelativePath);