changeset 22370:4b1005e85f94

Partially backed out changeset: a360c82ba357
author Andreas Woess <andreas.woess@oracle.com>
date Mon, 16 Nov 2015 16:25:13 +0100
parents 05f812bce8cc
children 75c4ce3a352a
files truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java
diffstat 1 files changed, 5 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java	Mon Nov 16 07:00:50 2015 +0100
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java	Mon Nov 16 16:25:13 2015 +0100
@@ -59,7 +59,6 @@
 
     public static final String GraphVisualizerAddress = "127.0.0.1";
     public static final int GraphVisualizerPort = 4444;
-    private static final boolean ENABLED = !System.getProperty("truffle.graphprint", "").equalsIgnoreCase("false");
     private static final String DEFAULT_GRAPH_NAME = "truffle tree";
 
     private Map<Object, NodeElement> nodeMap;
@@ -228,7 +227,7 @@
     }
 
     private static Impl createImpl(OutputStream outputStream) {
-        return ENABLED ? new XMLImpl(outputStream) : new DummyImpl();
+        return new XMLImpl(outputStream);
     }
 
     private void ensureOpen() {
@@ -369,7 +368,7 @@
 
     @Override
     public String toString() {
-        if (outputStream instanceof ByteArrayOutputStream && ENABLED) {
+        if (outputStream instanceof ByteArrayOutputStream) {
             return new String(((ByteArrayOutputStream) outputStream).toByteArray(), Charset.forName("UTF-8"));
         }
         return super.toString();
@@ -377,7 +376,7 @@
 
     public void printToFile(File f) {
         close();
-        if (outputStream instanceof ByteArrayOutputStream && ENABLED) {
+        if (outputStream instanceof ByteArrayOutputStream) {
             try (OutputStream os = new FileOutputStream(f)) {
                 os.write(((ByteArrayOutputStream) outputStream).toByteArray());
             } catch (IOException e) {
@@ -388,7 +387,7 @@
 
     public void printToSysout() {
         close();
-        if (outputStream instanceof ByteArrayOutputStream && ENABLED) {
+        if (outputStream instanceof ByteArrayOutputStream) {
             PrintStream out = System.out;
             out.println(toString());
         }
@@ -396,7 +395,7 @@
 
     public void printToNetwork(boolean ignoreErrors) {
         close();
-        if (outputStream instanceof ByteArrayOutputStream && ENABLED) {
+        if (outputStream instanceof ByteArrayOutputStream) {
             try (Socket socket = new Socket(GraphVisualizerAddress, GraphVisualizerPort); BufferedOutputStream os = new BufferedOutputStream(socket.getOutputStream(), 0x4000)) {
                 os.write(((ByteArrayOutputStream) outputStream).toByteArray());
             } catch (IOException e) {
@@ -628,32 +627,6 @@
         }
     }
 
-    private static class DummyImpl implements Impl {
-        public void writeStartDocument() {
-        }
-
-        public void writeEndDocument() {
-        }
-
-        public void writeStartElement(String name) {
-        }
-
-        public void writeEndElement() {
-        }
-
-        public void writeAttribute(String name, String value) {
-        }
-
-        public void writeCharacters(String text) {
-        }
-
-        public void flush() {
-        }
-
-        public void close() {
-        }
-    }
-
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.TYPE)
     public @interface CustomGraphPrintHandler {