Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
9a465b16
Commit
9a465b16
authored
8 years ago
by
Ekaterina Tuzova
Committed by
Ekaterina Tuzova
8 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fixed test data
parent
0bd23a98
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
python/educational-core/src/com/jetbrains/edu/learning/StudySerializationUtils.java
+3
-3
...c/com/jetbrains/edu/learning/StudySerializationUtils.java
with
3 additions
and
3 deletions
+3
-3
python/educational-core/src/com/jetbrains/edu/learning/StudySerializationUtils.java
+
3
-
3
View file @
9a465b16
...
@@ -542,7 +542,7 @@ public class StudySerializationUtils {
...
@@ -542,7 +542,7 @@ public class StudySerializationUtils {
return
stepOptions
;
return
stepOptions
;
}
}
private
JsonObject
convertToThirdVersion
(
JsonObject
stepOptionsJson
)
{
private
static
JsonObject
convertToThirdVersion
(
JsonObject
stepOptionsJson
)
{
if
(!
stepOptionsJson
.
has
(
LAST_SUBTASK
))
return
stepOptionsJson
;
if
(!
stepOptionsJson
.
has
(
LAST_SUBTASK
))
return
stepOptionsJson
;
final
int
lastSubtaskIndex
=
stepOptionsJson
.
get
(
LAST_SUBTASK
).
getAsInt
();
final
int
lastSubtaskIndex
=
stepOptionsJson
.
get
(
LAST_SUBTASK
).
getAsInt
();
if
(
lastSubtaskIndex
==
0
)
return
stepOptionsJson
;
if
(
lastSubtaskIndex
==
0
)
return
stepOptionsJson
;
...
@@ -554,7 +554,7 @@ public class StudySerializationUtils {
...
@@ -554,7 +554,7 @@ public class StudySerializationUtils {
}
}
}
}
final
JsonArray
descriptions
=
stepOptionsJson
.
getAsJsonArray
(
TEXTS
);
final
JsonArray
descriptions
=
stepOptionsJson
.
getAsJsonArray
(
TEXTS
);
if
(
descriptions
.
size
()
>
0
)
{
if
(
descriptions
!=
null
&&
descriptions
.
size
()
>
0
)
{
final
JsonObject
fileWrapper
=
descriptions
.
get
(
0
).
getAsJsonObject
();
final
JsonObject
fileWrapper
=
descriptions
.
get
(
0
).
getAsJsonObject
();
if
(
fileWrapper
.
has
(
NAME
))
{
if
(
fileWrapper
.
has
(
NAME
))
{
replaceWithSubtask
(
fileWrapper
);
replaceWithSubtask
(
fileWrapper
);
...
@@ -563,7 +563,7 @@ public class StudySerializationUtils {
...
@@ -563,7 +563,7 @@ public class StudySerializationUtils {
return
stepOptionsJson
;
return
stepOptionsJson
;
}
}
private
void
replaceWithSubtask
(
JsonObject
fileWrapper
)
{
private
static
void
replaceWithSubtask
(
JsonObject
fileWrapper
)
{
final
String
file
=
fileWrapper
.
get
(
NAME
).
getAsString
();
final
String
file
=
fileWrapper
.
get
(
NAME
).
getAsString
();
final
String
extension
=
FileUtilRt
.
getExtension
(
file
);
final
String
extension
=
FileUtilRt
.
getExtension
(
file
);
final
String
name
=
FileUtil
.
getNameWithoutExtension
(
file
);
final
String
name
=
FileUtil
.
getNameWithoutExtension
(
file
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help