changeset 4287:152f3b514618

Merge
author Gilles Duboscq <gilles.m.duboscq@gmail.com>
date Tue, 17 Jan 2012 13:43:19 +0100
parents 76190108a9f2 9770cb8164b7
children 2bc254976621 cbed6f7e2d10
files
diffstat 4 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties	Tue Jan 17 13:43:10 2012 +0100
+++ b/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties	Tue Jan 17 13:43:19 2012 +0100
@@ -2,4 +2,4 @@
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=ebcf0422
 nbproject/build-impl.xml.script.CRC32=42ef3ff6
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java	Tue Jan 17 13:43:10 2012 +0100
+++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java	Tue Jan 17 13:43:19 2012 +0100
@@ -293,7 +293,7 @@
         @Override
         protected InputBlock start() throws SAXException {
             InputGraph graph = getParentObject();
-            String name = readRequiredAttribute(BLOCK_NAME_PROPERTY).intern();
+            String name = readRequiredAttribute(BLOCK_NAME_PROPERTY);
             InputBlock b = graph.addBlock(name);
             for (InputNode n : b.getNodes()) {
                 assert graph.getBlock(n).equals(b);
@@ -447,12 +447,12 @@
 
         @Override
         public String start() throws SAXException {
-            return readRequiredAttribute(PROPERTY_NAME_PROPERTY).intern();
+            return readRequiredAttribute(PROPERTY_NAME_PROPERTY);
          }
 
         @Override
         public void end(String text) {
-            getParentObject().getProperties().setProperty(getObject(), text.trim().intern());
+            getParentObject().getProperties().setProperty(getObject(), text.trim());
         }
     };
 
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java	Tue Jan 17 13:43:10 2012 +0100
+++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java	Tue Jan 17 13:43:19 2012 +0100
@@ -150,8 +150,8 @@
         public void processAttributesAsProperties(Properties p) {
             int length = attr.getLength();
             for (int i = 0; i < length; i++) {
-                String val = attr.getValue(i).intern();
-                String localName = attr.getLocalName(i).intern();
+                String val = attr.getValue(i);
+                String localName = attr.getLocalName(i);
                 p.setProperty(val, localName);
             }
         }
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter	Tue Jan 17 13:43:10 2012 +0100
+++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter	Tue Jan 17 13:43:19 2012 +0100
@@ -1,5 +1,3 @@
-colorize("abstract", "1", yellow);
-colorize("leaf", "1", lightGray);
-
-var f = new com.sun.hotspot.igv.filter.EdgeColorIndexFilter("INPUTS", [black, pink]);
-f.apply(graph);
+colorize("name", "<init>.*", yellow);
+colorize("name", "<clinit>.*", pink);
+colorize("leaf", "1", red);