X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=inline;f=bundles%2Forg.simantics.graph%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Frefactoring%2FFixExportedOntology.java;h=ffe174eb943b236be72e4d1a8f26808070828608;hb=976bf85e9915e294d39d2673d7f8bb90f6a70144;hp=91d85ecf9732f9c5395b1094c2731a0d468e7d4c;hpb=fa806341cc06b72051d5e8d709674eb9d5c2bf00;p=simantics%2Fplatform.git
diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java b/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
index 91d85ecf9..ffe174eb9 100644
--- a/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
@@ -1,7 +1,6 @@
package org.simantics.graph.refactoring;
import java.io.BufferedInputStream;
-import java.io.DataInput;
import java.io.DataInputStream;
import java.io.InputStream;
import java.nio.file.Files;
@@ -10,7 +9,6 @@ import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.mutable.Variant;
import org.simantics.databoard.container.DataContainer;
import org.simantics.databoard.container.DataContainers;
import org.simantics.graph.representation.PrettyPrintTG;
@@ -25,19 +23,15 @@ public class FixExportedOntology {
static TransferableGraph1 convertExportedSharedOntologyIntoBundleOntology(Path input, Path output) throws Exception {
System.out.format("Converting exported shared ontology%n\t" + input.toString() + "%nto bundle-compatible ontology%n\t" + output.toString());
try (InputStream is = new BufferedInputStream(Files.newInputStream(input), 128*1024)) {
- DataInput dis = new DataInputStream(is);
- org.simantics.databoard.container.DataContainer container =
- DataContainers.readFile(dis);
- Binding binding = TransferableGraph1.BINDING;
- TransferableGraph1 graph = (TransferableGraph1)container.content.getValue(binding);
+ Binding tgBinding = TransferableGraph1.BINDING;
+ DataContainer container = DataContainers.readFile(new DataInputStream(is), tgBinding);
+ TransferableGraph1 graph = (TransferableGraph1) container.content.getValue(tgBinding);
+
GraphRefactoringUtils.fixOntologyExport(graph);
+ container = TransferableGraphHasher.addHashToTG(container, graph);
- DataContainers.writeFile(output.toFile(), new DataContainer(
- container.format, container.version,
- container.metadata, new Variant(TransferableGraph1.BINDING, graph)));
-
+ DataContainers.writeFile(output.toFile(), container);
return graph;
-
}
}
@@ -50,12 +44,12 @@ public class FixExportedOntology {
convertExportedSharedOntologyIntoBundleOntology(input, output);
}
- public static void createPGraph(Path input) throws Exception {
+ public static void createTGAndPGraph(Path input) throws Exception {
Path output1 = input.getParent().resolve("graph.tg");
TransferableGraph1 tg = convertExportedSharedOntologyIntoBundleOntology(input, output1);
String listing = PrettyPrintTG.print(tg, false);
String newName = input.getFileName().toString();
- if (newName.contains("\\."))
+ if (newName.contains("."))
newName = newName.split("\\.")[0];
Path output2 = input.getParent().resolve(newName + ".pgraph");
Files.write(output2, listing.getBytes(),StandardOpenOption.CREATE);
@@ -66,7 +60,7 @@ public class FixExportedOntology {
System.out.println("Required arguments: [