Skip to content

Add letter at beginning if ids begin with number. #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
soerendomroes wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add letter at beginning if ids begin with number. #1169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions plugins/org.eclipse.elk.graph.json/src/org/eclipse/elk/graph/json/JsonImporter.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,16 +753,27 @@ final class JsonImporter {
*/

private def ElkNode register(ElkNode node, Object obj) {
val id = obj.toJsonObject.id

var id = obj.toJsonObject.id
// If the id is an integer or begins with a number, construct a string id with a leading 'n' character.
if (id instanceof Integer) {
id = 'n' + id.toString
} else if (id instanceof String && (id as String).matches("^[0-9].*")) {
id = 'n' + id
}
nodeIdMap.put(id, node)
nodeJsonMap.put(node, obj)

return node
}

private def ElkPort register(ElkPort port, Object obj) {
val id = obj.toJsonObject.id
var id = obj.toJsonObject.id
// If the id is an integer or begins with a number, construct a string id with a leading 'p' character.
if (id instanceof Integer) {
id = 'p' + id.toString
} else if (id instanceof String && (id as String).matches("^[0-9].*")) {
id = 'p' + id
}

portIdMap.put(id, port)
portJsonMap.put(port, obj)
Expand All @@ -771,7 +782,13 @@ final class JsonImporter {
}

private def ElkEdge register(ElkEdge edge, Object obj) {
val id = obj.toJsonObject.id
var id = obj.toJsonObject.id
// If the id is an integer or begins with a number, construct a string id with a leading 'e' character.
if (id instanceof Integer) {
id = 'e' + id.toString
} else if (id instanceof String && (id as String).matches("^[0-9].*")) {
id = 'e' + id
}

edgeIdMap.put(id, edge)
edgeJsonMap.put(edge, obj)
Expand Down Expand Up @@ -858,4 +875,4 @@ final class JsonImporter {
return edgeCoordsMap.get(element)
}

}
}
Loading