Commit fc23978c authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

995: Upgrade underlying frameworks to current GS state

Task-Url: https://pm.winseda.de/issues/995
parent ef4754b3
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.unibamberg.minf</groupId>
<artifactId>dme</artifactId>
<version>3.0.17-RELEASE</version>
<version>3.0.18_SNAPSHOT</version>
<packaging>war</packaging>
<name>DARIAH-DE Data Modeling Environment</name>
<description>DARIAH-DE Data Modeling Environment</description>
......
......@@ -167,7 +167,7 @@ public abstract class BaseMainEditorController extends BaseScheregController {
fileNode.put("fileSize", humanReadableByteCount(file.getBytes().length, false));
fileNode.put("deleteLink", "/async/file/delete/" + tmpId);
if (validationUrl!=null) {
fileNode.put("validateLink", String.format("/async/file/%s/", String.format(validationUrl, tmpId)));
fileNode.put("validateLink", String.format("/async/file/%s/", String.format(validationUrl, tmpId + "/")));
}
filesNode.add(fileNode);
return filesNode;
......
......@@ -81,7 +81,7 @@ public abstract class BaseJsonDatamodelImporter extends BaseDatamodelImporter im
return new String[]{""};
}
protected void importModel(Datamodel m, Nonterminal root, Map<String, GrammarContainer> grammars) throws MetamodelConsistencyException {
protected void importModel(Datamodel m, Element root, Map<String, GrammarContainer> grammars) throws MetamodelConsistencyException {
Map<String, String> newToOldIdMap = new HashMap<String, String>();
Map<String, String> oldToNewIdMap = new HashMap<String, String>();
......
......@@ -84,7 +84,7 @@ public class JsonDatamodelImporter extends BaseJsonDatamodelImporter {
this.collectElementReferences(s.getRoot(), elementReferences);
this.resolveReoccurringElements(s.getRoot(), elementReferences, new ArrayList<String>());;
this.importModel(s.getModel(), (Nonterminal)s.getRoot(), s.getGrammars());
this.importModel(s.getModel(), s.getRoot(), s.getGrammars());
}
private void resolveReoccurringElements(ModelElement e, Map<String, ModelElement> elements, List<String> processedIds) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment