Mercurial > hg > truffle
changeset 2765:2fd52cd64156
IdealGraphVisualizer: Upgrade to NetBeans 7.0 as platform
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml Mon May 23 18:03:55 2011 +0200 @@ -4,6 +4,13 @@ *** EDIT ../build.xml INSTEAD *** --> <project name="com.sun.hotspot.igv.svg-impl" basedir=".."> + <fail message="Please build using Ant 1.7.1 or higher."> + <condition> + <not> + <antversion atleast="1.7.1"/> + </not> + </condition> + </fail> <property file="nbproject/private/suite-private.properties"/> <property file="nbproject/suite.properties"/> <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail> @@ -16,13 +23,21 @@ <property name="@{name}" value="${@{value}}"/> </sequential> </macrodef> + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2"> + <attribute name="property"/> + <attribute name="value"/> + <sequential> + <property name="@{property}" value="@{value}"/> + </sequential> + </macrodef> <property file="${user.properties.file}"/> <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> - <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> - <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'"> + <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> + <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness)."> <condition> <not> - <available file="${harness.dir}" type="dir"/> + <contains string="${cluster.path.evaluated}" substring="platform"/> </not> </condition> </fail>
--- a/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties Mon May 23 18:03:55 2011 +0200 @@ -1,8 +1,8 @@ build.xml.data.CRC32=ebcf0422 build.xml.script.CRC32=d7a2678d -build.xml.stylesheet.CRC32=79c3b980 +build.xml.stylesheet.CRC32=a56c6a5b@1.45.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # 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=57997f94 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 +nbproject/build-impl.xml.script.CRC32=42ef3ff6 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf Mon May 23 18:03:55 2011 +0200 @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.bytecodes -OpenIDE-Module-Layer: com/sun/hotspot/igv/bytecodes/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/bytecodes/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.bytecodes +OpenIDE-Module-Layer: com/sun/hotspot/igv/bytecodes/layer.xml +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/bytecodes/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 +
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -20,7 +20,7 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.4</specification-version> + <specification-version>1.16.1</specification-version> </run-dependency> </dependency> <dependency> @@ -28,7 +28,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.11</specification-version> + <specification-version>6.34.1</specification-version> </run-dependency> </dependency> <dependency> @@ -36,7 +36,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.2.0.1</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -44,7 +44,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.9.0.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> <dependency> @@ -52,7 +60,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.16</specification-version> + <specification-version>6.39.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf Mon May 23 18:03:55 2011 +0200 @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.controlflow -OpenIDE-Module-Layer: com/sun/hotspot/igv/controlflow/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/controlflow/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.controlflow +OpenIDE-Module-Layer: com/sun/hotspot/igv/controlflow/layer.xml +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/controlflow/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 +
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -36,7 +36,7 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.4</specification-version> + <specification-version>1.16.1</specification-version> </run-dependency> </dependency> <dependency> @@ -52,7 +52,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.9.0.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> <dependency>
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -44,7 +44,7 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.10.0.1</specification-version> + <specification-version>1.23.1</specification-version> </run-dependency> </dependency> <dependency> @@ -52,7 +52,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.6.1.1</specification-version> + <specification-version>6.21.1</specification-version> </run-dependency> </dependency> <dependency> @@ -60,7 +60,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.11.0.1</specification-version> + <specification-version>7.30.1</specification-version> </run-dependency> </dependency> <dependency> @@ -68,7 +68,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.5.1</specification-version> + <specification-version>7.18.1</specification-version> </run-dependency> </dependency> <dependency> @@ -76,7 +76,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.11</specification-version> + <specification-version>6.34.1</specification-version> </run-dependency> </dependency> <dependency> @@ -84,7 +84,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.3</specification-version> + <specification-version>7.46.1</specification-version> </run-dependency> </dependency> <dependency> @@ -92,7 +92,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.7</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -100,7 +100,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.2.0.1</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -108,7 +108,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.9.0.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> <dependency> @@ -116,7 +124,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.16</specification-version> + <specification-version>6.39.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml Mon May 23 18:03:55 2011 +0200 @@ -4,12 +4,8 @@ <kind type="view" /> <state type="joined" /> <constraints> - <path orientation="horizontal" number="0" weight="0.779245283018868"/> - <path orientation="vertical" number="0" weight="0.7511825922421949"/> - <path orientation="horizontal" number="0" weight="0.5"/> - <path orientation="vertical" number="20" weight="0.7"/> - <path orientation="horizontal" number="40" weight="0.55"/> - <path orientation="horizontal" number="0" weight="0.2711864406779661"/> + <path orientation="horizontal" number="0" weight="0.2"/> + <path orientation="vertical" number="0" weight="0.75"/> </constraints> <bounds x="0" y="0" width="0" height="0" /> <frame state="0"/>
--- a/src/share/tools/IdealGraphVisualizer/Data/manifest.mf Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Data/manifest.mf Mon May 23 18:03:55 2011 +0200 @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.data -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/data/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.data +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/data/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 +
--- a/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -28,7 +28,15 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.4.1</specification-version> + <specification-version>1.16.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.awt</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>7.30.1</specification-version> </run-dependency> </dependency> <dependency> @@ -36,7 +44,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.5.1</specification-version> + <specification-version>7.18.1</specification-version> </run-dependency> </dependency> <dependency> @@ -44,7 +52,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.3</specification-version> + <specification-version>7.46.1</specification-version> </run-dependency> </dependency> <dependency> @@ -52,7 +60,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.2.0.1</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -60,7 +68,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.9.0.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> <dependency> @@ -68,7 +84,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.16</specification-version> + <specification-version>6.39.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml Mon May 23 18:03:55 2011 +0200 @@ -4,6 +4,13 @@ *** EDIT ../build.xml INSTEAD *** --> <project name="com.sun.hotspot.igv.filterwindow-impl" basedir=".."> + <fail message="Please build using Ant 1.7.1 or higher."> + <condition> + <not> + <antversion atleast="1.7.1"/> + </not> + </condition> + </fail> <property file="nbproject/private/suite-private.properties"/> <property file="nbproject/suite.properties"/> <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail> @@ -16,13 +23,21 @@ <property name="@{name}" value="${@{value}}"/> </sequential> </macrodef> + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2"> + <attribute name="property"/> + <attribute name="value"/> + <sequential> + <property name="@{property}" value="@{value}"/> + </sequential> + </macrodef> <property file="${user.properties.file}"/> <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> - <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> - <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'"> + <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> + <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness)."> <condition> <not> - <available file="${harness.dir}" type="dir"/> + <contains string="${cluster.path.evaluated}" substring="platform"/> </not> </condition> </fail>
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties Mon May 23 18:03:55 2011 +0200 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=401b2654 +build.xml.data.CRC32=09ba2a87 build.xml.script.CRC32=9c158403 -build.xml.stylesheet.CRC32=79c3b980 +build.xml.stylesheet.CRC32=a56c6a5b@1.45.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # 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=401b2654 -nbproject/build-impl.xml.script.CRC32=19fb08e0 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 +nbproject/build-impl.xml.data.CRC32=09ba2a87 +nbproject/build-impl.xml.script.CRC32=e4293f0e +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -43,7 +43,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.6.1.1</specification-version> + <specification-version>6.21.1</specification-version> </run-dependency> </dependency> <dependency> @@ -51,7 +51,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.5.1</specification-version> + <specification-version>7.18.1</specification-version> </run-dependency> </dependency> <dependency> @@ -59,7 +59,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.12.1</specification-version> + <specification-version>6.34.1</specification-version> </run-dependency> </dependency> <dependency> @@ -67,7 +67,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.3.1</specification-version> + <specification-version>7.46.1</specification-version> </run-dependency> </dependency> <dependency> @@ -75,7 +75,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.7.1</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -83,7 +83,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.2.1.1</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -91,7 +91,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.10.1.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> <dependency> @@ -99,7 +107,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.18.1</specification-version> + <specification-version>6.39.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java Mon May 23 18:03:55 2011 +0200 @@ -24,7 +24,7 @@ package com.sun.hotspot.igv.filterwindow; import org.openide.explorer.view.NodeListModel; -import org.openide.nodes.Node; +import org.openide.explorer.view.Visualizer; /** * @@ -32,15 +32,11 @@ */ public class CheckNodeListModel extends NodeListModel { - private Node rootNode; - - @Override - public void setNode(Node rootNode) { - this.rootNode = rootNode; - super.setNode(rootNode); - } - public CheckNode getCheckNodeAt(int index) { - return (CheckNode) rootNode.getChildren().getNodes()[index]; + Object item = getElementAt(index); + if (item != null) { + return (CheckNode) Visualizer.findNode(item); + } + return null; } }
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml Mon May 23 18:03:55 2011 +0200 @@ -4,8 +4,8 @@ <kind type="view" /> <state type="joined" /> <constraints> - <path orientation="horizontal" number="45" weight="0.21761006289308177"/> - <path orientation="vertical" number="0" weight="0.2510122989593188"/> + <path orientation="horizontal" number="90" weight="0.2"/> + <path orientation="vertical" number="0" weight="0.75"/> </constraints> <bounds x="0" y="0" width="0" height="0" /> <frame state="0"/>
--- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml Mon May 23 18:03:55 2011 +0200 @@ -4,6 +4,13 @@ *** EDIT ../build.xml INSTEAD *** --> <project name="com.sun.hotspot.igv.connection-impl" basedir=".."> + <fail message="Please build using Ant 1.7.1 or higher."> + <condition> + <not> + <antversion atleast="1.7.1"/> + </not> + </condition> + </fail> <property file="nbproject/private/suite-private.properties"/> <property file="nbproject/suite.properties"/> <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail> @@ -16,13 +23,21 @@ <property name="@{name}" value="${@{value}}"/> </sequential> </macrodef> + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2"> + <attribute name="property"/> + <attribute name="value"/> + <sequential> + <property name="@{property}" value="@{value}"/> + </sequential> + </macrodef> <property file="${user.properties.file}"/> <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> - <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> - <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'"> + <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> + <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/> + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness)."> <condition> <not> - <available file="${harness.dir}" type="dir"/> + <contains string="${cluster.path.evaluated}" substring="platform"/> </not> </condition> </fail>
--- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties Mon May 23 18:03:55 2011 +0200 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=f8e21cb6 +build.xml.data.CRC32=5a0e591e build.xml.script.CRC32=a265137e -build.xml.stylesheet.CRC32=79c3b980 +build.xml.stylesheet.CRC32=a56c6a5b@1.45.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # 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=f8e21cb6 -nbproject/build-impl.xml.script.CRC32=36f3138c -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 +nbproject/build-impl.xml.data.CRC32=5a0e591e +nbproject/build-impl.xml.script.CRC32=61516e53 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
--- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -27,7 +27,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.11.1.1</specification-version> + <specification-version>7.30.1</specification-version> </run-dependency> </dependency> <dependency> @@ -35,7 +35,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.5.1</specification-version> + <specification-version>7.18.1</specification-version> </run-dependency> </dependency> <dependency> @@ -43,7 +43,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.10.1.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/README Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/README Mon May 23 18:03:55 2011 +0200 @@ -5,16 +5,11 @@ was the primary target of the tool. The tool itself is fairly general with only a few modules that contain C2 specific elements. -The tool is built on top of the NetBeans 6.1 rich client +The tool is built on top of the NetBeans 7 rich client infrastructure and so requires NetBeans to build. It currently requires Java 6 to run as it needs support for JavaScript for its filtering mechanism and assumes it's built into the platform. It -should build out of the box with NetBeans 6.1 and Java 6 or later. -It's possible to run it on 1.5 by including Rhino on the classpath -though that currently isn't working correctly. Support for exporting -graphs as SVG can be enabled by adding batik to the classpath which -isn't included by default. It can be built on top of NetBeans 6.0 if -you change the required modules to be platform7 instead of platform8. +should build out of the box with NetBeans 7.0 and Java 6 or later. The JVM support is controlled by the flag -XX:PrintIdealGraphLevel=# where # is:
--- a/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -12,7 +12,7 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.4</specification-version> + <specification-version>1.16.1</specification-version> </run-dependency> </dependency> <dependency> @@ -21,7 +21,7 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.5</specification-version> + <specification-version>1.21.1</specification-version> </run-dependency> </dependency> <dependency> @@ -29,7 +29,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.11.0.1</specification-version> + <specification-version>7.30.1</specification-version> </run-dependency> </dependency> <dependency> @@ -37,7 +37,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.9.0.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -19,7 +19,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>2.9</specification-version> + <specification-version>2.27.1</specification-version> </run-dependency> </dependency> <dependency> @@ -27,7 +27,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.2.1.1</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -35,7 +35,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.10.1.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/View/nbproject/project.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/nbproject/project.xml Mon May 23 18:03:55 2011 +0200 @@ -83,7 +83,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>2.9</specification-version> + <specification-version>2.27.1</specification-version> </run-dependency> </dependency> <dependency> @@ -91,7 +91,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.6.0.1</specification-version> + <specification-version>6.21.1</specification-version> </run-dependency> </dependency> <dependency> @@ -99,7 +99,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.11.0.1</specification-version> + <specification-version>7.30.1</specification-version> </run-dependency> </dependency> <dependency> @@ -107,7 +107,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.5.1</specification-version> + <specification-version>7.18.1</specification-version> </run-dependency> </dependency> <dependency> @@ -115,7 +115,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.7</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -123,7 +123,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.2.1.1</specification-version> + <specification-version>7.20.1</specification-version> </run-dependency> </dependency> <dependency> @@ -131,7 +131,15 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.9.0.1</specification-version> + <specification-version>8.14.1</specification-version> + </run-dependency> + </dependency> + <dependency> + <code-name-base>org.openide.util.lookup</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>8.6.1</specification-version> </run-dependency> </dependency> <dependency> @@ -139,7 +147,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.16</specification-version> + <specification-version>6.39.1</specification-version> </run-dependency> </dependency> </module-dependencies>
--- a/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties Mon May 23 18:03:55 2011 +0200 @@ -3,5 +3,5 @@ SPLASH_WIDTH=475 SplashProgressBarBounds=0,268,473,6 SplashProgressBarColor=0xFFFFFF -SplashRunningTextBounds=269,253,205,12 +SplashRunningTextBounds=10,281,459,12 SplashRunningTextColor=0xFFFFFF
--- a/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml Mon May 23 18:03:55 2011 +0200 @@ -4,6 +4,13 @@ *** EDIT ../build.xml INSTEAD *** --> <project name="IdealGraphVisualizer-impl" basedir=".." xmlns:sproject="http://www.netbeans.org/ns/nb-module-suite-project/1"> + <fail message="Please build using Ant 1.7.1 or higher."> + <condition> + <not> + <antversion atleast="1.7.1"/> + </not> + </condition> + </fail> <property file="nbproject/private/platform-private.properties"/> <property file="nbproject/platform.properties"/> <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-suite-project/1"> @@ -13,13 +20,28 @@ <property name="@{name}" value="${@{value}}"/> </sequential> </macrodef> + <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-suite-project/1"> + <attribute name="property"/> + <attribute name="value"/> + <sequential> + <property name="@{property}" value="@{value}"/> + </sequential> + </macrodef> <property file="${user.properties.file}"/> <sproject:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir"/> - <sproject:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir"/> - <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'"> + <sproject:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir"/> + <sproject:evalprops property="cluster.path.evaluated" value="${cluster.path}"/> + <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness)."> <condition> <not> - <available file="${harness.dir}" type="dir"/> + <contains string="${cluster.path.evaluated}" substring="platform"/> + </not> + </condition> + </fail> + <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly."> + <condition> + <not> + <available type="dir" file="${harness.dir}"/> </not> </condition> </fail>
--- a/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties Mon May 23 18:03:55 2011 +0200 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=72833581 -build.xml.script.CRC32=e9c757c5 -build.xml.stylesheet.CRC32=531c622b +build.xml.data.CRC32=3c2c6126 +build.xml.script.CRC32=48934e60 +build.xml.stylesheet.CRC32=eaf9f76a@1.45.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # 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=72833581 -nbproject/build-impl.xml.script.CRC32=1b6f3648 -nbproject/build-impl.xml.stylesheet.CRC32=196c7090 +nbproject/build-impl.xml.data.CRC32=3c2c6126 +nbproject/build-impl.xml.script.CRC32=5a29eb53 +nbproject/build-impl.xml.stylesheet.CRC32=183e6ef3@1.45.1
--- a/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties Mon May 23 18:03:55 2011 +0200 @@ -1,29 +1,15 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - gsf1,\ - harness,\ - ide9,\ - java2,\ - nb6.1,\ - profiler3 +cluster.path=\ + ${nbplatform.active.dir}/platform disabled.modules=\ org.netbeans.core.execution,\ org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ + org.netbeans.libs.jsr223,\ org.netbeans.modules.autoupdate.services,\ org.netbeans.modules.autoupdate.ui,\ org.netbeans.modules.core.kit,\ org.netbeans.modules.favorites,\ - org.netbeans.modules.javahelp,\ - org.netbeans.modules.masterfs,\ - org.netbeans.modules.options.keymap,\ - org.netbeans.modules.sendopts,\ - org.netbeans.modules.templates,\ org.openide.compat,\ org.openide.execution,\ + org.openide.options,\ org.openide.util.enumerations -enabled.clusters=\ - platform8 -nbjdk.active=default nbplatform.active=default
--- a/src/share/tools/IdealGraphVisualizer/nbproject/project.properties Mon May 23 15:07:01 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/project.properties Mon May 23 18:03:55 2011 +0200 @@ -1,4 +1,3 @@ -app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif app.name=idealgraphvisualizer app.title=IdealGraphVisualizer branding.token=${app.name} @@ -17,7 +16,7 @@ ${project.com.sun.hotspot.igv.util}:\ ${project.com.sun.hotspot.igv.svg}:\ ${project.com.sun.hotspot.connection}:\ - ${project.com.sun.hotspot.igv.servercompilerscheduler}:\ + ${project.com.sun.hotspot.igv.servercompiler}:\ ${project.com.sun.hotspot.igv.filterwindow} project.com.sun.hotspot.connection=NetworkConnection project.com.sun.hotspot.igv.bytecodes=Bytecodes @@ -30,7 +29,7 @@ project.com.sun.hotspot.igv.graph=Graph project.com.sun.hotspot.igv.hierarchicallayout=HierarchicalLayout project.com.sun.hotspot.igv.layout=Layout -project.com.sun.hotspot.igv.servercompilerscheduler=ServerCompiler +project.com.sun.hotspot.igv.servercompiler=ServerCompiler project.com.sun.hotspot.igv.settings=Settings project.com.sun.hotspot.igv.svg=BatikSVGProxy project.com.sun.hotspot.igv.view=View