Better and prettier printing

[simantics/platform.git] / bundles / org.simantics.graph / src / org / simantics / graph / refactoring / FixExportedOntology.java

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 bf0224103228a0838952cf553b9fea9b54d14ed6..ea449417d305ee7eac034af76e3ceadec07e7b79 100644 (file)
--- a/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
@@ -7,11 +7,13 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 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;
 import org.simantics.graph.representation.TransferableGraph1;
 
 /**
@@ -20,7 +22,7 @@ import org.simantics.graph.representation.TransferableGraph1;
  */
 public class FixExportedOntology {
        
-       static void convertExportedSharedOntologyIntoBundleOntology(Path input, Path output) throws Exception {
+       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);
@@ -33,16 +35,22 @@ public class FixExportedOntology {
                        DataContainers.writeFile(output.toFile(), new DataContainer(
                                        container.format, container.version,
                                        container.metadata, new Variant(TransferableGraph1.BINDING, graph)));
+                       
+                       return graph;
+                       
                }
        }
 
        public static void main(String[] args) throws Exception {
-               if (args.length < 1) {
-                       System.out.println("Required arguments: <input .sharedOntology file> [<output .tg file>]");
-               } else if (args.length < 2) {
+               if (args.length == 0) {
+                       System.out.println("Required arguments: <input .sharedLibrary file> [<output .tg file>]");
+               } else if (args.length == 1) {
                        Path input = Paths.get(args[0]);
-                       Path output = input.getParent().resolve(input.getName(input.getNameCount()-1) + ".fixed");
-                       convertExportedSharedOntologyIntoBundleOntology(input, output);
+                       Path output1 = input.getParent().resolve("graph.tg");
+                       TransferableGraph1 tg = convertExportedSharedOntologyIntoBundleOntology(input, output1);
+                       String listing = PrettyPrintTG.print(tg);
+                       Path output2 = Paths.get(args[0].substring(0, args[0].length() - ".sharedLibrary".length()) + ".pgraph");
+                       Files.write(output2, listing.getBytes(),StandardOpenOption.CREATE);
                } else {
                        convertExportedSharedOntologyIntoBundleOntology(Paths.get(args[0]), Paths.get(args[1]));
                }