X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.graph%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Frefactoring%2FFixExportedOntology.java;h=27c4b9195522d82291c6374586c0db985d1bfe4b;hb=refs%2Fchanges%2F98%2F1998%2F2;hp=1c567b1e21d39294f00652a0e8467e33cf803044;hpb=aea3e7b117a8398471f10c31844efffc8026f815;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 1c567b1e2..27c4b9195 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,32 +23,45 @@ 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;
-
}
}
+
+ public static void createTg(Path input) throws Exception {
+ Path output = input.getParent().resolve("graph.tg");
+ createTg(input, output);
+ }
+
+ private static void createTg(Path input, Path output) throws Exception {
+ convertExportedSharedOntologyIntoBundleOntology(input, output);
+ }
+
+ public static void createTGAndPGraph(Path input) throws Exception {
+ String newName = input.getFileName().toString();
+ if (newName.contains("."))
+ newName = newName.split("\\.")[0];
+ Path parent = input.getParent();
+ Path output1 = parent.resolve(newName + ".tg");
+ TransferableGraph1 tg = convertExportedSharedOntologyIntoBundleOntology(input, output1);
+ String listing = PrettyPrintTG.print(tg, false);
+ Path output2 = parent.resolve(newName + ".pgraph");
+ Files.write(output2, listing.getBytes(),StandardOpenOption.CREATE);
+ }
public static void main(String[] args) throws Exception {
if (args.length == 0) {
System.out.println("Required arguments: [