diff --git a/src/utils/IdealGraphVisualizer/.gitignore b/src/utils/IdealGraphVisualizer/.gitignore new file mode 100644 index 00000000000..785134c4410 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/.gitignore @@ -0,0 +1,2 @@ +/*/target +.igv.log \ No newline at end of file diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/build.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/build.xml deleted file mode 100644 index 2c8642cfb1a..00000000000 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.svg. - - diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml deleted file mode 100644 index 152f6e32395..00000000000 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties deleted file mode 100644 index 3306e529b83..00000000000 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties +++ /dev/null @@ -1,5 +0,0 @@ -# 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=42ef3ff6 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1 diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml deleted file mode 100644 index 3939a84a094..00000000000 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.svg - - - - com.sun.hotspot.igv.svg - - - - diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/pom.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/pom.xml new file mode 100644 index 00000000000..dccb16b356b --- /dev/null +++ b/src/utils/IdealGraphVisualizer/BatikSVGProxy/pom.xml @@ -0,0 +1,85 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + BatikSVGProxy + 1.0-SNAPSHOT + nbm + BatikSVGProxy + + UTF-8 + + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.svg + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml deleted file mode 100644 index c16a8a0fed6..00000000000 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/java/com/sun/hotspot/igv/svg/BatikSVG.java similarity index 100% rename from src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/java/com/sun/hotspot/igv/svg/BatikSVG.java diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/package-info.java b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/java/com/sun/hotspot/igv/svg/package-info.java similarity index 100% rename from src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/package-info.java rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/java/com/sun/hotspot/igv/svg/package-info.java diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/manifest.mf b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/nbm/manifest.mf similarity index 74% rename from src/utils/IdealGraphVisualizer/BatikSVGProxy/manifest.mf rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/nbm/manifest.mf index 689e17a01e8..175014d653e 100644 --- a/src/utils/IdealGraphVisualizer/BatikSVGProxy/manifest.mf +++ b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/nbm/manifest.mf @@ -1,6 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.svg -OpenIDE-Module-Layer: com/sun/hotspot/igv/svg/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/svg/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.svg +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/svg/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties b/src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/resources/com/sun/hotspot/igv/svg/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties rename to src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/resources/com/sun/hotspot/igv/svg/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/build.xml b/src/utils/IdealGraphVisualizer/Bytecodes/build.xml deleted file mode 100644 index 1466d8606bc..00000000000 --- a/src/utils/IdealGraphVisualizer/Bytecodes/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.bytecodes. - - diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml deleted file mode 100644 index 4991499c388..00000000000 --- a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties deleted file mode 100644 index a60cd07cac9..00000000000 --- a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=1dee290d -build.xml.script.CRC32=d594034f -build.xml.stylesheet.CRC32=79c3b980 -# 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=1dee290d -nbproject/build-impl.xml.script.CRC32=b4dab126 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.xml deleted file mode 100644 index 823323dc054..00000000000 --- a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/project.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.bytecodes - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.graph - - - - 1.0 - - - - com.sun.hotspot.igv.util - - - - 1.0 - - - - org.jdesktop.layout - - - - 1 - 1.16.1 - - - - org.openide.awt - - - - 7.39.1 - - - - org.openide.explorer - - - - 6.34.1 - - - - org.openide.nodes - - - - 7.20.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - org.openide.windows - - - - 6.39.1 - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/pom.xml b/src/utils/IdealGraphVisualizer/Bytecodes/pom.xml new file mode 100644 index 00000000000..188537f81d6 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Bytecodes/pom.xml @@ -0,0 +1,130 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Bytecodes + 1.0-SNAPSHOT + nbm + Bytecodes + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Graph + ${project.version} + + + com.sun.hotspot.igv + Util + ${project.version} + + + net.java.dev.swing-layout + swing-layout + ${swinglayouts.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-explorer + ${netbeans.version} + + + org.netbeans.api + org-openide-windows + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-nodes + ${netbeans.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/BytecodeNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/BytecodeNode.java diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/MethodNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/MethodNode.java diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/java/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/manifest.mf b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/nbm/manifest.mf similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/manifest.mf rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/nbm/manifest.mf diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.png b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/images/bytecode.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.png rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/images/bytecode.png diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.png b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/images/link.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.png rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/images/link.png diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.png b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/images/method.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.png rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/images/method.png diff --git a/src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml b/src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/layer.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml rename to src/utils/IdealGraphVisualizer/Bytecodes/src/main/resources/com/sun/hotspot/igv/bytecodes/layer.xml diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/build.xml b/src/utils/IdealGraphVisualizer/ControlFlow/build.xml deleted file mode 100644 index b90d3b8b143..00000000000 --- a/src/utils/IdealGraphVisualizer/ControlFlow/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.controlflow. - - diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml deleted file mode 100644 index 1664c75b0dc..00000000000 --- a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties deleted file mode 100644 index ba61dc52aba..00000000000 --- a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=b524efb3 -build.xml.script.CRC32=79a27be9 -build.xml.stylesheet.CRC32=79c3b980 -# 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=b524efb3 -nbproject/build-impl.xml.script.CRC32=582bdab7 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.properties deleted file mode 100644 index 152f44eca60..00000000000 --- a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.5 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.xml b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.xml deleted file mode 100644 index d992b332a5a..00000000000 --- a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/project.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.controlflow - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.hierarchicallayout - - - - 1.0 - - - - com.sun.hotspot.igv.layout - - - - 1.0 - - - - com.sun.hotspot.igv.util - - - - 1.0 - - - - org.jdesktop.layout - - - - 1 - 1.16.1 - - - - org.netbeans.api.visual - - - - 2.9 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - org.openide.windows - - - - 6.16 - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/pom.xml b/src/utils/IdealGraphVisualizer/ControlFlow/pom.xml new file mode 100644 index 00000000000..491a1ae504b --- /dev/null +++ b/src/utils/IdealGraphVisualizer/ControlFlow/pom.xml @@ -0,0 +1,130 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + ControlFlow + 1.0-SNAPSHOT + nbm + ControlFlow + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Util + ${project.version} + + + com.sun.hotspot.igv + Layout + ${project.version} + + + com.sun.hotspot.igv + HierarchicalLayout + ${project.version} + + + org.netbeans.api + org-netbeans-api-visual + ${netbeans.version} + + + net.java.dev.swing-layout + swing-layout + ${swinglayouts.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + org.netbeans.api + org-openide-windows + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockWidget.java diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowAction.java diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowScene.java similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowScene.java diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/manifest.mf b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/manifest.mf rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/layer.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml rename to src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/layer.xml diff --git a/src/utils/IdealGraphVisualizer/Coordinator/build.xml b/src/utils/IdealGraphVisualizer/Coordinator/build.xml deleted file mode 100644 index a70f0080267..00000000000 --- a/src/utils/IdealGraphVisualizer/Coordinator/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.coordinator. - - diff --git a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml deleted file mode 100644 index 4deca64beea..00000000000 --- a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties deleted file mode 100644 index 71781f95c87..00000000000 --- a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=077de97c -build.xml.script.CRC32=d29d586c -build.xml.stylesheet.CRC32=79c3b980 -# 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=077de97c -nbproject/build-impl.xml.script.CRC32=03daa42d -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.xml deleted file mode 100644 index 9342c8124fd..00000000000 --- a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/project.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.coordinator - - - - com.sun.hotspot.igv.connection - - - - 1.0 - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.difference - - - - 1.0 - - - - com.sun.hotspot.igv.settings - - - - 1.0 - - - - com.sun.hotspot.igv.util - - - - 1.0 - - - - org.netbeans.api.progress - - - - 1 - 1.23.1 - - - - org.openide.actions - - - - 6.21.1 - - - - org.openide.awt - - - - 7.30.1 - - - - org.openide.dialogs - - - - 7.18.1 - - - - org.openide.explorer - - - - 6.34.1 - - - - org.openide.filesystems - - - - 7.46.1 - - - - org.openide.loaders - - - - 7.20.1 - - - - org.openide.nodes - - - - 7.20.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - org.openide.windows - - - - 6.39.1 - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Coordinator/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Coordinator/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Coordinator/pom.xml b/src/utils/IdealGraphVisualizer/Coordinator/pom.xml new file mode 100644 index 00000000000..9c6617876e9 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Coordinator/pom.xml @@ -0,0 +1,155 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Coordinator + 1.0-SNAPSHOT + nbm + Coordinator + + UTF-8 + + + + com.sun.hotspot.igv + NetworkConnection + ${project.version} + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Difference + ${project.version} + + + com.sun.hotspot.igv + Settings + ${project.version} + + + com.sun.hotspot.igv + Util + ${project.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + org.netbeans.api + org-netbeans-api-progress + ${netbeans.version} + + + org.netbeans.api + org-netbeans-api-progress-nb + ${netbeans.version} + + + org.netbeans.api + org-openide-explorer + ${netbeans.version} + + + org.netbeans.api + org-openide-loaders + ${netbeans.version} + + + org.netbeans.api + org-openide-windows + ${netbeans.version} + + + org.netbeans.api + org-openide-actions + ${netbeans.version} + + + org.netbeans.api + org-openide-nodes + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/FolderNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/FolderNode.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/GraphNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/GraphNode.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/CloneGraphAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/GraphCloneCookie.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/ImportAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/ImportAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java diff --git a/src/utils/IdealGraphVisualizer/Coordinator/manifest.mf b/src/utils/IdealGraphVisualizer/Coordinator/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/Coordinator/manifest.mf rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/nbm/manifest.mf index 073c1e8040b..4c8df38cb58 100644 --- a/src/utils/IdealGraphVisualizer/Coordinator/manifest.mf +++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/nbm/manifest.mf @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.coordinator -OpenIDE-Module-Layer: com/sun/hotspot/igv/coordinator/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/coordinator/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.coordinator +OpenIDE-Module-Layer: com/sun/hotspot/igv/coordinator/layer.xml +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/coordinator/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/Bundle.properties similarity index 97% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/Bundle.properties index 2f8c29631fc..1b17042508e 100644 --- a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties +++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/Bundle.properties @@ -1,6 +1,6 @@ -AdvancedOption_DisplayName_Coordinator=Settings -AdvancedOption_Tooltip_Coordinator=Visualization Tool Settings -CTL_OutlineTopComponent=Outline -CTL_SomeAction=test -HINT_OutlineTopComponent=Displays loaded groups of graphs. -OpenIDE-Module-Name=Coordinator +AdvancedOption_DisplayName_Coordinator=Settings +AdvancedOption_Tooltip_Coordinator=Visualization Tool Settings +CTL_OutlineTopComponent=Outline +CTL_SomeAction=test +HINT_OutlineTopComponent=Displays loaded groups of graphs. +OpenIDE-Module-Name=Coordinator diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/actions/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/actions/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/diff.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/diff.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/folder.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/folder.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/graph.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/graph.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/import.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/import.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/remove.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/remove.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/removeall.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/removeall.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/save.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/save.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/saveall.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/saveall.gif diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/structure.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.png rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/structure.png diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/structured.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/structured.gif diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml similarity index 99% rename from src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml index ef808eed53c..04d0af31eca 100644 --- a/src/utils/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml +++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml @@ -130,7 +130,7 @@ - + diff --git a/src/utils/IdealGraphVisualizer/Data/build.xml b/src/utils/IdealGraphVisualizer/Data/build.xml deleted file mode 100644 index dd626066c85..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.data. - - diff --git a/src/utils/IdealGraphVisualizer/Data/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Data/nbproject/build-impl.xml deleted file mode 100644 index 942d7a628fc..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Data/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/genfiles.properties deleted file mode 100644 index 621e413c962..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=a403efd8 -build.xml.script.CRC32=b87f73ba -build.xml.stylesheet.CRC32=79c3b980 -# 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=a403efd8 -nbproject/build-impl.xml.script.CRC32=cc649146 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Data/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Data/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/project.properties deleted file mode 100644 index c5b391f33d3..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/nbproject/project.properties +++ /dev/null @@ -1,8 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial -src.dir=src -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -test.src.dir=test -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results diff --git a/src/utils/IdealGraphVisualizer/Data/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Data/nbproject/project.xml deleted file mode 100644 index 6446f1e3fb1..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/nbproject/project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.data - - - - - unit - - org.netbeans.libs.junit4 - - - - org.openide.util - - - - - - com.sun.hotspot.igv.data - com.sun.hotspot.igv.data.serialization - com.sun.hotspot.igv.data.services - - - - diff --git a/src/utils/IdealGraphVisualizer/Data/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Data/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Data/pom.xml b/src/utils/IdealGraphVisualizer/Data/pom.xml new file mode 100644 index 00000000000..055b085ffc8 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Data/pom.xml @@ -0,0 +1,99 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Data + 1.0-SNAPSHOT + nbm + Data + + UTF-8 + + + + junit + junit + ${junit.version} + test + + + org.netbeans.api + org-openide-util + ${netbeans.version} + test + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.data + com.sun.hotspot.igv.data.services + com.sun.hotspot.igv.data.serialization + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties b/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties deleted file mode 100644 index f17788c7ff4..00000000000 --- a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties +++ /dev/null @@ -1 +0,0 @@ -OpenIDE-Module-Name=Data diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ChangedEvent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ChangedEvent.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ChangedEventProvider.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ChangedEventProvider.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ChangedListener.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ChangedListener.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ControllableChangedListener.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/ControllableChangedListener.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Event.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Event.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Folder.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Folder.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/FolderElement.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/FolderElement.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/GraphDocument.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/GraphDocument.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Group.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Group.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlock.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlock.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlockEdge.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlockEdge.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBytecode.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBytecode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBytecode.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBytecode.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputEdge.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputEdge.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputGraph.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputGraph.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputMethod.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputMethod.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Pair.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Pair.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Properties.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Properties.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Property.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Property.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Source.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Source.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/BinaryParser.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/BinaryParser.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/BinaryParser.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/BinaryParser.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/GraphParser.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/GraphParser.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/GraphParser.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/GraphParser.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/ParseMonitor.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/ParseMonitor.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java similarity index 95% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java index afd470ae078..b2832cb399b 100644 --- a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java +++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,6 +104,7 @@ public class Parser implements GraphParser { private GraphDocument graphDocument; private final ParseMonitor monitor; private final ReadableByteChannel channel; + private boolean invokeLater = true; private int lookupID(String i) { try { @@ -145,12 +146,12 @@ public class Parser implements GraphParser { final Folder parent = getParentObject(); if (groupCallback == null || parent instanceof Group) { - SwingUtilities.invokeLater(new Runnable(){ - @Override - public void run() { - parent.addElement(group); - } - }); + Runnable addToParent = () -> parent.addElement(group); + if (invokeLater) { + SwingUtilities.invokeLater(addToParent); + } else { + addToParent.run(); + } } return group; @@ -280,14 +281,12 @@ public class Parser implements GraphParser { } blockConnections.clear(); - SwingUtilities.invokeLater(new Runnable(){ - - @Override - public void run() { - // Add to group - parent.addElement(graph); - } - }); + Runnable addToParent = () -> parent.addElement(graph); + if (invokeLater) { + SwingUtilities.invokeLater(addToParent); + } else { + addToParent.run(); + } } }; // @@ -448,12 +447,12 @@ public class Parser implements GraphParser { public void end(String text) throws SAXException { if (groupCallback != null && getParentObject().getParent() instanceof GraphDocument) { final Group group = getParentObject(); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - groupCallback.started(group); - } - }); + Runnable addStarted = () -> groupCallback.started(group); + if (invokeLater) { + SwingUtilities.invokeLater(addStarted); + } else { + addStarted.run(); + } } } }; @@ -543,17 +542,17 @@ public class Parser implements GraphParser { return graphDocument; } + // Whether the parser is allowed to defer connecting the parsed elements. + // Setting to false is useful for synchronization in unit tests. + public void setInvokeLater(boolean invokeLater) { + this.invokeLater = invokeLater; + } + private XMLReader createReader() throws SAXException { try { SAXParserFactory pfactory = SAXParserFactory.newInstance(); - pfactory.setValidating(true); + pfactory.setValidating(false); pfactory.setNamespaceAware(true); - - // Enable schema validation - SchemaFactory sfactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema"); - InputStream stream = Parser.class.getResourceAsStream("graphdocument.xsd"); - pfactory.setSchema(sfactory.newSchema(new Source[]{new StreamSource(stream)})); - return pfactory.newSAXParser().getXMLReader(); } catch (ParserConfigurationException ex) { throw new SAXException(ex); diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/XMLParser.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/XMLParser.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/XMLWriter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/XMLWriter.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GraphViewer.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GraphViewer.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/InputGraphProvider.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/InputGraphProvider.java diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/Scheduler.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java rename to src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/Scheduler.java diff --git a/src/utils/IdealGraphVisualizer/Data/manifest.mf b/src/utils/IdealGraphVisualizer/Data/src/main/nbm/manifest.mf similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/manifest.mf rename to src/utils/IdealGraphVisualizer/Data/src/main/nbm/manifest.mf diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/resources/com/sun/hotspot/igv/data/Bundle.properties b/src/utils/IdealGraphVisualizer/Data/src/main/resources/com/sun/hotspot/igv/data/Bundle.properties new file mode 100644 index 00000000000..4d9a18708a4 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Data/src/main/resources/com/sun/hotspot/igv/data/Bundle.properties @@ -0,0 +1 @@ +#OpenIDE-Module-Name=Data diff --git a/src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/graphdocument.xsd b/src/utils/IdealGraphVisualizer/Data/src/main/resources/com/sun/hotspot/igv/data/serialization/graphdocument.xsd similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/graphdocument.xsd rename to src/utils/IdealGraphVisualizer/Data/src/main/resources/com/sun/hotspot/igv/data/serialization/graphdocument.xsd diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/ChangedEventTest.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/ChangedEventTest.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/GroupTest.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/GroupTest.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/InputGraphTest.java similarity index 96% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/InputGraphTest.java index 7ae20ca6c36..effdef391b4 100644 --- a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java +++ b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/InputGraphTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,11 +54,11 @@ public class InputGraphTest { private static final InputNode N3 = new InputNode(3); private static final InputNode N4 = new InputNode(4); private static final InputNode N5 = new InputNode(5); - private static final InputEdge E12 = new InputEdge((char)0, 1, 2); - private static final InputEdge E13 = new InputEdge((char)0, 1, 3); - private static final InputEdge E24 = new InputEdge((char)0, 2, 4); - private static final InputEdge E34 = new InputEdge((char)0, 3, 4); - private static final InputEdge E54 = new InputEdge((char)0, 5, 4); + private static final InputEdge E12 = new InputEdge((char)0, (char)0, 1, 2, "", ""); + private static final InputEdge E13 = new InputEdge((char)0, (char)0, 1, 3, "", ""); + private static final InputEdge E24 = new InputEdge((char)0, (char)0, 2, 4, "", ""); + private static final InputEdge E34 = new InputEdge((char)0, (char)0, 3, 4, "", ""); + private static final InputEdge E54 = new InputEdge((char)0, (char)0, 5, 4, "", ""); public InputGraphTest() { } @@ -112,7 +112,7 @@ public class InputGraphTest { parentB.addElement(b); InputGraph c = new InputGraph("graph"); - parentB.addElement(b); + parentB.addElement(c); Util.assertGraphEquals(a, b); Util.assertGraphEquals(b, c); diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/InputMethodTest.java similarity index 95% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/InputMethodTest.java index b7c9cddc5fc..8b3f2371f8d 100644 --- a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java +++ b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/InputMethodTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -82,7 +82,8 @@ public class InputMethodTest { assertThat(m.getBytecodes().get(0).getName(), is("iload_0")); assertThat(m.getBytecodes().get(1).getName(), is("iconst_1")); - assertThat(m.getBytecodes().get(2).getName(), is("if_icmpne 7")); + assertThat(m.getBytecodes().get(2).getName(), is("if_icmpne")); + assertThat(m.getBytecodes().get(2).getOperands(), is("7")); assertThat(m.getBytecodes().get(6).getName(), is("ireturn")); assertThat(m.getBytecodes().get(2).getInlined(), nullValue()); diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/PairTest.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/PairTest.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/PropertiesTest.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/PropertiesTest.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/PropertyTest.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/PropertyTest.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/SourceTest.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/SourceTest.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/Util.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/Util.java diff --git a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/serialization/ParserTest.java similarity index 88% rename from src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java rename to src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/serialization/ParserTest.java index f375441dfdf..c6b36d07c6d 100644 --- a/src/utils/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java +++ b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/serialization/ParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,6 @@ import static org.junit.Assert.fail; import org.junit.*; import org.openide.util.Exceptions; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; /** * @@ -72,9 +71,10 @@ public class ParserTest { InputStream in = new ByteArrayInputStream(xmlString.getBytes("UTF-8")); try { Parser parser = new Parser(Channels.newChannel(in)); + parser.setInvokeLater(false); final GraphDocument parsedDocument = parser.parse(); Util.assertGraphDocumentEquals(document, parsedDocument); - } catch (SAXException ex) { + } catch (IOException ex) { fail(ex.toString()); } } catch (UnsupportedEncodingException ex) { @@ -120,16 +120,16 @@ public class ParserTest { graph.addNode(new InputNode(3)); test(doc); - graph.addEdge(new InputEdge((char)0, (char)0, 0, 1)); + graph.addEdge(new InputEdge((char)0, (char)0, 0, 1, "", "")); test(doc); - graph.addEdge(new InputEdge((char)1, (char)1, 0, 1)); + graph.addEdge(new InputEdge((char)1, (char)1, 0, 1, "", "")); test(doc); - graph.addEdge(new InputEdge((char)0, (char)0, 1, 2)); + graph.addEdge(new InputEdge((char)0, (char)0, 1, 2, "", "")); test(doc); - graph.addEdge(new InputEdge((char)0, (char)0, 2, 3)); + graph.addEdge(new InputEdge((char)0, (char)0, 2, 3, "", "")); test(doc); group1.setMethod(new InputMethod(group1, "testMethod", "tM", 1)); @@ -172,8 +172,8 @@ public class ParserTest { InputNode n1 = new InputNode(0); InputNode n2 = new InputNode(1); - InputEdge e1 = new InputEdge((char)0, 0, 1); - InputEdge e2 = new InputEdge((char)1, 0, 1); + InputEdge e1 = new InputEdge((char)0, (char)0, 0, 1, "", ""); + InputEdge e2 = new InputEdge((char)0, (char)1, 0, 1, "", ""); graph.addNode(n1); graph.addNode(n2); graph.addEdge(e1); @@ -195,8 +195,8 @@ public class ParserTest { InputNode n1 = new InputNode(0); InputNode n2 = new InputNode(1); - InputEdge e1 = new InputEdge((char)0, 0, 0); - InputEdge e2 = new InputEdge((char)1, 1, 1); + InputEdge e1 = new InputEdge((char)0, (char)0, 0, 0, "", ""); + InputEdge e2 = new InputEdge((char)0, (char)1, 1, 1, "", ""); graph.addNode(n1); graph.addNode(n2); graph.addEdge(e1); @@ -207,7 +207,7 @@ public class ParserTest { graph2.addNode(n1); InputNode n3 = new InputNode(2); graph2.addNode(n3); - InputEdge e3 = new InputEdge((char)0, 0, 2); + InputEdge e3 = new InputEdge((char)0, (char)0, 0, 2, "", ""); graph2.addEdge(e3); test(document); diff --git a/src/utils/IdealGraphVisualizer/Difference/build.xml b/src/utils/IdealGraphVisualizer/Difference/build.xml deleted file mode 100644 index bc11fd91f85..00000000000 --- a/src/utils/IdealGraphVisualizer/Difference/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.difference. - - diff --git a/src/utils/IdealGraphVisualizer/Difference/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Difference/nbproject/build-impl.xml deleted file mode 100644 index 1c1b96a9dea..00000000000 --- a/src/utils/IdealGraphVisualizer/Difference/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Difference/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/genfiles.properties deleted file mode 100644 index 1c01a0733d1..00000000000 --- a/src/utils/IdealGraphVisualizer/Difference/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=1657ecfe -build.xml.script.CRC32=03909051 -build.xml.stylesheet.CRC32=79c3b980 -# 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=1657ecfe -nbproject/build-impl.xml.script.CRC32=2208e770 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Difference/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Difference/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Difference/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Difference/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Difference/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Difference/nbproject/project.xml deleted file mode 100644 index 7260e5d2a3a..00000000000 --- a/src/utils/IdealGraphVisualizer/Difference/nbproject/project.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.difference - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - - com.sun.hotspot.igv.difference - - - - diff --git a/src/utils/IdealGraphVisualizer/Difference/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Difference/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Difference/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Difference/pom.xml b/src/utils/IdealGraphVisualizer/Difference/pom.xml new file mode 100644 index 00000000000..7f78b4c355e --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Difference/pom.xml @@ -0,0 +1,100 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Difference + 1.0-SNAPSHOT + nbm + Difference + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.difference + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java b/src/utils/IdealGraphVisualizer/Difference/src/main/java/com/sun/hotspot/igv/difference/Difference.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java rename to src/utils/IdealGraphVisualizer/Difference/src/main/java/com/sun/hotspot/igv/difference/Difference.java diff --git a/src/utils/IdealGraphVisualizer/Difference/manifest.mf b/src/utils/IdealGraphVisualizer/Difference/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/Difference/manifest.mf rename to src/utils/IdealGraphVisualizer/Difference/src/main/nbm/manifest.mf index febe22452a0..f8790195ee6 100644 --- a/src/utils/IdealGraphVisualizer/Difference/manifest.mf +++ b/src/utils/IdealGraphVisualizer/Difference/src/main/nbm/manifest.mf @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.difference -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/difference/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.difference +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/difference/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties b/src/utils/IdealGraphVisualizer/Difference/src/main/resources/com/sun/hotspot/igv/difference/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties rename to src/utils/IdealGraphVisualizer/Difference/src/main/resources/com/sun/hotspot/igv/difference/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Filter/build.xml b/src/utils/IdealGraphVisualizer/Filter/build.xml deleted file mode 100644 index 2182f70466c..00000000000 --- a/src/utils/IdealGraphVisualizer/Filter/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.filter. - - diff --git a/src/utils/IdealGraphVisualizer/Filter/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Filter/nbproject/build-impl.xml deleted file mode 100644 index 363a56cc9d9..00000000000 --- a/src/utils/IdealGraphVisualizer/Filter/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Filter/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/genfiles.properties deleted file mode 100644 index 0b45838e076..00000000000 --- a/src/utils/IdealGraphVisualizer/Filter/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=7c032ebf -build.xml.script.CRC32=3b022a25 -build.xml.stylesheet.CRC32=79c3b980 -# 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=7c032ebf -nbproject/build-impl.xml.script.CRC32=26513f91 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Filter/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Filter/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Filter/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Filter/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Filter/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Filter/nbproject/project.xml deleted file mode 100644 index 626e1cdd621..00000000000 --- a/src/utils/IdealGraphVisualizer/Filter/nbproject/project.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.filter - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.graph - - - - 1.0 - - - - com.sun.hotspot.igv.layout - - - - 1.0 - - - - org.jdesktop.layout - - - - 1 - 1.16.1 - - - - org.openide.awt - - - - 7.30.1 - - - - org.openide.dialogs - - - - 7.18.1 - - - - org.openide.filesystems - - - - 7.46.1 - - - - org.openide.nodes - - - - 7.20.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - org.openide.windows - - - - 6.39.1 - - - - - com.sun.hotspot.igv.filter - - - - diff --git a/src/utils/IdealGraphVisualizer/Filter/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Filter/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Filter/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Filter/pom.xml b/src/utils/IdealGraphVisualizer/Filter/pom.xml new file mode 100644 index 00000000000..0b1fe342605 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Filter/pom.xml @@ -0,0 +1,139 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Filter + 1.0-SNAPSHOT + nbm + Filter + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Layout + ${project.version} + + + com.sun.hotspot.igv + Graph + ${project.version} + + + net.java.dev.swing-layout + swing-layout + ${swinglayouts.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-windows + ${netbeans.version} + + + org.netbeans.api + org-openide-nodes + ${netbeans.version} + + + org.netbeans.api + org-openide-filesystems + ${netbeans.version} + + + + + + [15,) + + + + org.openjdk.nashorn + nashorn-core + 15.2 + + + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.filter + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/AbstractFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/AbstractFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ColorFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ColorFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CombineFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CombineFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ConnectionFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ConnectionFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CustomFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CustomFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EditFilterDialog.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EditFilterDialog.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/Filter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/Filter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterChain.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterChain.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterChainProvider.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterChainProvider.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterSetting.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterSetting.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/GradientColorFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/GradientColorFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveInputsFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveInputsFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/SplitFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/SplitFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java rename to src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java diff --git a/src/utils/IdealGraphVisualizer/Filter/manifest.mf b/src/utils/IdealGraphVisualizer/Filter/src/main/nbm/manifest.mf similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/manifest.mf rename to src/utils/IdealGraphVisualizer/Filter/src/main/nbm/manifest.mf diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties b/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties rename to src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form b/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/EditFilterDialog.form similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form rename to src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/EditFilterDialog.form diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js b/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/helper.js similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js rename to src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/helper.js diff --git a/src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml b/src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/layer.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml rename to src/utils/IdealGraphVisualizer/Filter/src/main/resources/com/sun/hotspot/igv/filter/layer.xml diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/build.xml b/src/utils/IdealGraphVisualizer/FilterWindow/build.xml deleted file mode 100644 index e604ea7bcba..00000000000 --- a/src/utils/IdealGraphVisualizer/FilterWindow/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.filterwindow. - - diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml deleted file mode 100644 index f769a829911..00000000000 --- a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties deleted file mode 100644 index 10dcb4dd2e5..00000000000 --- a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties +++ /dev/null @@ -1,5 +0,0 @@ -# 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=5b8e8a60 -nbproject/build-impl.xml.script.CRC32=e4293f0e -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1 diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.properties b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.xml b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.xml deleted file mode 100644 index d6a7375c5b9..00000000000 --- a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/project.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.filterwindow - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.filter - - - - 1.0 - - - - com.sun.hotspot.igv.graph - - - - 1.0 - - - - com.sun.hotspot.igv.util - - - - 1.0 - - - - org.openide.actions - - - - 6.21.1 - - - - org.openide.awt - - - - 7.39.1 - - - - org.openide.dialogs - - - - 7.18.1 - - - - org.openide.explorer - - - - 6.34.1 - - - - org.openide.filesystems - - - - 7.46.1 - - - - org.openide.loaders - - - - 7.20.1 - - - - org.openide.nodes - - - - 7.20.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - org.openide.windows - - - - 6.39.1 - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/pom.xml b/src/utils/IdealGraphVisualizer/FilterWindow/pom.xml new file mode 100644 index 00000000000..a130fccd2db --- /dev/null +++ b/src/utils/IdealGraphVisualizer/FilterWindow/pom.xml @@ -0,0 +1,150 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + FilterWindow + 1.0-SNAPSHOT + nbm + FilterWindow + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Filter + ${project.version} + + + com.sun.hotspot.igv + Graph + ${project.version} + + + com.sun.hotspot.igv + Util + ${project.version} + + + org.netbeans.api + org-openide-loaders + ${netbeans.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-windows + ${netbeans.version} + + + org.netbeans.api + org-openide-nodes + ${netbeans.version} + + + org.netbeans.api + org-openide-filesystems + ${netbeans.version} + + + org.netbeans.api + org-openide-actions + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + org.netbeans.api + org-openide-dialogs + ${netbeans.version} + + + org.netbeans.api + org-openide-explorer + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider b/src/utils/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider deleted file mode 100644 index a3cdc882cca..00000000000 --- a/src/utils/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider +++ /dev/null @@ -1 +0,0 @@ -com.sun.hotspot.igv.filterwindow.FilterChainProviderImplementation diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckListView.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckListView.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckNode.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckRenderer.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/CheckRenderer.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java similarity index 90% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java index e0a049253b2..c0e8dd58e29 100644 --- a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java +++ b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,11 +25,13 @@ package com.sun.hotspot.igv.filterwindow; import com.sun.hotspot.igv.filter.FilterChain; import com.sun.hotspot.igv.filter.FilterChainProvider; +import org.openide.util.lookup.ServiceProvider; /** * * @author Thomas Wuerthinger */ +@ServiceProvider(service=FilterChainProvider.class) public class FilterChainProviderImplementation implements FilterChainProvider { @Override diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterNode.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/manifest.mf b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/FilterWindow/manifest.mf rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/nbm/manifest.mf index ba1485636f6..eacdc7108e1 100644 --- a/src/utils/IdealGraphVisualizer/FilterWindow/manifest.mf +++ b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/nbm/manifest.mf @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.filterwindow -OpenIDE-Module-Layer: com/sun/hotspot/igv/filterwindow/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/filterwindow/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.filterwindow +OpenIDE-Module-Layer: com/sun/hotspot/igv/filterwindow/layer.xml +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/filterwindow/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/add.png similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/add.png diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/delete.png similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/delete.png diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/down.png similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/down.png diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/minus.png similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/minus.png diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/plus.png similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/plus.png diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.png b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/up.png similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.png rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/images/up.png diff --git a/src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml b/src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/layer.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml rename to src/utils/IdealGraphVisualizer/FilterWindow/src/main/resources/com/sun/hotspot/igv/filterwindow/layer.xml diff --git a/src/utils/IdealGraphVisualizer/Graal/build.xml b/src/utils/IdealGraphVisualizer/Graal/build.xml deleted file mode 100644 index 8011dca6c8f..00000000000 --- a/src/utils/IdealGraphVisualizer/Graal/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.graal. - - diff --git a/src/utils/IdealGraphVisualizer/Graal/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Graal/nbproject/build-impl.xml deleted file mode 100644 index 3f27701c7ae..00000000000 --- a/src/utils/IdealGraphVisualizer/Graal/nbproject/build-impl.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Graal/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Graal/nbproject/genfiles.properties deleted file mode 100644 index 3ae068e841f..00000000000 --- a/src/utils/IdealGraphVisualizer/Graal/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=92ea213f -build.xml.script.CRC32=3534d355 -build.xml.stylesheet.CRC32=a56c6a5b@2.67.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=92ea213f -nbproject/build-impl.xml.script.CRC32=2867f2d5 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1 diff --git a/src/utils/IdealGraphVisualizer/Graal/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Graal/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Graal/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Graal/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Graal/nbproject/project.xml deleted file mode 100644 index b082f586940..00000000000 --- a/src/utils/IdealGraphVisualizer/Graal/nbproject/project.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.graal - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.filter - - - - 1.0 - - - - com.sun.hotspot.igv.layout - - - - 1.0 - - - - com.sun.hotspot.igv.graph - - - - 1.0 - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Graal/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Graal/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Graal/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Graal/pom.xml b/src/utils/IdealGraphVisualizer/Graal/pom.xml new file mode 100644 index 00000000000..f4170426c7c --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Graal/pom.xml @@ -0,0 +1,100 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Graal + 1.0-SNAPSHOT + nbm + Graal + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Filter + ${project.version} + + + com.sun.hotspot.igv + Layout + ${project.version} + + + com.sun.hotspot.igv + Graph + ${project.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java rename to src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java rename to src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java rename to src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java diff --git a/src/utils/IdealGraphVisualizer/Graal/manifest.mf b/src/utils/IdealGraphVisualizer/Graal/src/main/nbm/manifest.mf similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/manifest.mf rename to src/utils/IdealGraphVisualizer/Graal/src/main/nbm/manifest.mf diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/Bundle.properties b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/Bundle.properties rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/callgraph.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/callgraph.filter rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/callgraph.filter diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/color.filter b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/color.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/color.filter rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/color.filter diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/probability.filter b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/probability.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/probability.filter rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/probability.filter diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/reduceEdges.filter b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/reduceEdges.filter similarity index 99% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/reduceEdges.filter rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/reduceEdges.filter index 59a1f8f6f62..59f0171361b 100644 --- a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/reduceEdges.filter +++ b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/reduceEdges.filter @@ -1,3 +1,3 @@ split("class", "ConstantLocationNode"); split("class", "ParameterNode"); -split("class", "ConstantNode"); +split("class", "ConstantNode"); diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeFloating.filter b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/removeFloating.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeFloating.filter rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/removeFloating.filter diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeState.filter b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/removeState.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/removeState.filter rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/removeState.filter diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/stampColor.filter b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/stampColor.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/stampColor.filter rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/filters/stampColor.filter diff --git a/src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml b/src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/layer.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml rename to src/utils/IdealGraphVisualizer/Graal/src/main/resources/com/sun/hotspot/igv/graal/layer.xml diff --git a/src/utils/IdealGraphVisualizer/Graph/build.xml b/src/utils/IdealGraphVisualizer/Graph/build.xml deleted file mode 100644 index 7843b57f1d5..00000000000 --- a/src/utils/IdealGraphVisualizer/Graph/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.graph. - - diff --git a/src/utils/IdealGraphVisualizer/Graph/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Graph/nbproject/build-impl.xml deleted file mode 100644 index d4b873896f2..00000000000 --- a/src/utils/IdealGraphVisualizer/Graph/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Graph/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/genfiles.properties deleted file mode 100644 index 473f81981cd..00000000000 --- a/src/utils/IdealGraphVisualizer/Graph/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=b2bc2f02 -build.xml.script.CRC32=486d5dab -build.xml.stylesheet.CRC32=79c3b980 -# 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=b2bc2f02 -nbproject/build-impl.xml.script.CRC32=17fa0f49 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Graph/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Graph/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Graph/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Graph/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Graph/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Graph/nbproject/project.xml deleted file mode 100644 index a4aadaa4751..00000000000 --- a/src/utils/IdealGraphVisualizer/Graph/nbproject/project.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.graph - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.layout - - - - 1.0 - - - - com.sun.hotspot.igv.util - - - - 1.0 - - - - - com.sun.hotspot.igv.graph - com.sun.hotspot.igv.graph.services - - - - diff --git a/src/utils/IdealGraphVisualizer/Graph/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Graph/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Graph/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Graph/pom.xml b/src/utils/IdealGraphVisualizer/Graph/pom.xml new file mode 100644 index 00000000000..bf31f002e57 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Graph/pom.xml @@ -0,0 +1,101 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Graph + 1.0-SNAPSHOT + nbm + Graph + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Layout + ${project.version} + + + com.sun.hotspot.igv + Util + ${project.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.graph + com.sun.hotspot.igv.graph.services + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/AndSelector.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/AndSelector.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Block.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Block.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Connection.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Connection.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Diagram.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Diagram.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Figure.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Figure.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/InputSlot.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/InputSlot.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/InvertSelector.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/InvertSelector.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/MatcherSelector.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/MatcherSelector.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/OrSelector.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/OrSelector.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/OutputSlot.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/OutputSlot.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/PredecessorSelector.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/PredecessorSelector.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Selector.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Selector.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Slot.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Slot.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/SuccessorSelector.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/SuccessorSelector.java diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/services/DiagramProvider.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/services/DiagramProvider.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/services/DiagramProvider.java rename to src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/services/DiagramProvider.java diff --git a/src/utils/IdealGraphVisualizer/Graph/manifest.mf b/src/utils/IdealGraphVisualizer/Graph/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/Graph/manifest.mf rename to src/utils/IdealGraphVisualizer/Graph/src/main/nbm/manifest.mf index aee3b0e8ec5..d757a1d2fe3 100644 --- a/src/utils/IdealGraphVisualizer/Graph/manifest.mf +++ b/src/utils/IdealGraphVisualizer/Graph/src/main/nbm/manifest.mf @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.graph -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/graph/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.graph +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/graph/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties b/src/utils/IdealGraphVisualizer/Graph/src/main/resources/com/sun/hotspot/igv/graph/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties rename to src/utils/IdealGraphVisualizer/Graph/src/main/resources/com/sun/hotspot/igv/graph/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/build.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/build.xml deleted file mode 100644 index 8376e08d8a8..00000000000 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.hierarchicallayout. - - diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml deleted file mode 100644 index 3257988a701..00000000000 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties deleted file mode 100644 index cb74676188a..00000000000 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=de087df9 -build.xml.script.CRC32=98977c36 -build.xml.stylesheet.CRC32=79c3b980 -# 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=de087df9 -nbproject/build-impl.xml.script.CRC32=0d734625 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml deleted file mode 100644 index fc4c20a9dad..00000000000 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.hierarchicallayout - - - - com.sun.hotspot.igv.layout - - - - 1.0 - - - - - com.sun.hotspot.igv.hierarchicallayout - - - - diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/pom.xml b/src/utils/IdealGraphVisualizer/HierarchicalLayout/pom.xml new file mode 100644 index 00000000000..2b3f09dcee5 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/pom.xml @@ -0,0 +1,90 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + HierarchicalLayout + 1.0-SNAPSHOT + nbm + HierarchicalLayout + + UTF-8 + + + + com.sun.hotspot.igv + Layout + ${project.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.hierarchicallayout + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Edge.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Edge.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Graph.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Graph.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Node.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Node.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Timing.java similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/Timing.java diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/manifest.mf b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/manifest.mf rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/nbm/manifest.mf index 723afd12fac..a3dbc7261b7 100644 --- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/manifest.mf +++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/nbm/manifest.mf @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.hierarchicallayout -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/hierarchicallayout/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.hierarchicallayout +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/hierarchicallayout/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/resources/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties rename to src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/resources/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Layout/build.xml b/src/utils/IdealGraphVisualizer/Layout/build.xml deleted file mode 100644 index 002f9bcc3e8..00000000000 --- a/src/utils/IdealGraphVisualizer/Layout/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.layout. - - diff --git a/src/utils/IdealGraphVisualizer/Layout/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Layout/nbproject/build-impl.xml deleted file mode 100644 index 84413d25676..00000000000 --- a/src/utils/IdealGraphVisualizer/Layout/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Layout/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/genfiles.properties deleted file mode 100644 index f054d11726d..00000000000 --- a/src/utils/IdealGraphVisualizer/Layout/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=cb0889d9 -build.xml.script.CRC32=d65fccb9 -build.xml.stylesheet.CRC32=79c3b980 -# 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=cb0889d9 -nbproject/build-impl.xml.script.CRC32=7f82736d -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Layout/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Layout/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Layout/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Layout/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Layout/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Layout/nbproject/project.xml deleted file mode 100644 index edd56a5bc66..00000000000 --- a/src/utils/IdealGraphVisualizer/Layout/nbproject/project.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.layout - - - - com.sun.hotspot.igv.layout - - - - diff --git a/src/utils/IdealGraphVisualizer/Layout/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Layout/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Layout/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Layout/pom.xml b/src/utils/IdealGraphVisualizer/Layout/pom.xml new file mode 100644 index 00000000000..af6d2a11484 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Layout/pom.xml @@ -0,0 +1,83 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Layout + 1.0-SNAPSHOT + nbm + Layout + + UTF-8 + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.layout + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Cluster.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java rename to src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Cluster.java diff --git a/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutGraph.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java rename to src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutGraph.java diff --git a/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutManager.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java rename to src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutManager.java diff --git a/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Link.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java rename to src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Link.java diff --git a/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Port.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java rename to src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Port.java diff --git a/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Vertex.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java rename to src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Vertex.java diff --git a/src/utils/IdealGraphVisualizer/Layout/manifest.mf b/src/utils/IdealGraphVisualizer/Layout/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/Layout/manifest.mf rename to src/utils/IdealGraphVisualizer/Layout/src/main/nbm/manifest.mf index eafc2369dc6..514f61c1e92 100644 --- a/src/utils/IdealGraphVisualizer/Layout/manifest.mf +++ b/src/utils/IdealGraphVisualizer/Layout/src/main/nbm/manifest.mf @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.layout -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/layout/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.layout +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/layout/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Bundle.properties b/src/utils/IdealGraphVisualizer/Layout/src/main/resources/com/sun/hotspot/igv/layout/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Bundle.properties rename to src/utils/IdealGraphVisualizer/Layout/src/main/resources/com/sun/hotspot/igv/layout/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/build.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/build.xml deleted file mode 100644 index 4565a3d6402..00000000000 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.connection. - - diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml deleted file mode 100644 index 5e1c4139d0f..00000000000 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties deleted file mode 100644 index 68c04ba5e2b..00000000000 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties +++ /dev/null @@ -1,5 +0,0 @@ -# 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=5a0e591e -nbproject/build-impl.xml.script.CRC32=4c38ce23 -nbproject/build-impl.xml.stylesheet.CRC32=e50cf570@2.62.1 diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml deleted file mode 100644 index 7623eb30fca..00000000000 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.connection - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.settings - - - - 1.0 - - - - org.openide.awt - - - - 7.30.1 - - - - org.openide.dialogs - - - - 7.18.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - - com.sun.hotspot.igv.connection - - - - diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/pom.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/pom.xml new file mode 100644 index 00000000000..8f20e3fc570 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/NetworkConnection/pom.xml @@ -0,0 +1,105 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + NetworkConnection + 1.0-SNAPSHOT + nbm + NetworkConnection + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Settings + ${project.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-dialogs + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.connection + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml b/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml deleted file mode 100644 index c16a8a0fed6..00000000000 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Client.java similarity index 100% rename from src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Client.java diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Server.java similarity index 100% rename from src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Server.java diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/manifest.mf b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/nbm/manifest.mf similarity index 73% rename from src/utils/IdealGraphVisualizer/NetworkConnection/manifest.mf rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/main/nbm/manifest.mf index 791c20daf71..8e908249149 100644 --- a/src/utils/IdealGraphVisualizer/NetworkConnection/manifest.mf +++ b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/nbm/manifest.mf @@ -1,6 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.connection -OpenIDE-Module-Layer: com/sun/hotspot/igv/connection/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/connection/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.connection +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/connection/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/resources/com/sun/hotspot/igv/connection/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties rename to src/utils/IdealGraphVisualizer/NetworkConnection/src/main/resources/com/sun/hotspot/igv/connection/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/README.md b/src/utils/IdealGraphVisualizer/README.md index 179d46cf837..382a2f4903b 100644 --- a/src/utils/IdealGraphVisualizer/README.md +++ b/src/utils/IdealGraphVisualizer/README.md @@ -3,22 +3,22 @@ The Ideal Graph Visualizer is a tool developed to help examine the intermediate representation of C2 which is commonly referred to as the "ideal graph". It was developed in collaboration with the University of Linz in Austria and has been -included as part of hotspot since that was the primary target of the tool. The +included as part of HotSpot since that 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 7 rich client infrastructure and so -requires NetBeans to build. It currently requires at least 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 7.0 and Java 6 -or later. +The tool is built on top of the NetBeans Platform, and requires a JDK version +between 8 and 15 (the latest JDK supported by the current NetBeans Platform). # Building and Running -The build system used for IGV is ant. To download all required libraries and -build IGV, issue `ant build`. To run IGV, use the `igv.sh` command; it will put -all log messages generated by the run to the file `.igv.log`. To see all log -messages generated during an IGV run, use `ant run`. +The build system used for IGV is Maven. To download all required libraries and +build IGV, issue `mvn install`. To run IGV, use the `igv.sh` command; it will +put all log messages generated by the run to the file `.igv.log`. + +To build and run IGV on a different JDK than the system default, set first the +`JAVA_HOME` to the appropriate directory. The same JDK version should be used +for building and running IGV. # Usage diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/build.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/build.xml deleted file mode 100644 index ddb36768ed5..00000000000 --- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.selectioncoordinator. - - diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml deleted file mode 100644 index 7b681fb1397..00000000000 --- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties deleted file mode 100644 index 0cf9e674992..00000000000 --- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties +++ /dev/null @@ -1,5 +0,0 @@ -# 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=13553862 -nbproject/build-impl.xml.script.CRC32=3db87c68 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1 diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/platform.properties deleted file mode 100644 index 4e58e5a3b1e..00000000000 --- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/platform.properties +++ /dev/null @@ -1,129 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - gsf1,\ - harness,\ - java2,\ - nb6.1,\ - profiler3 -disabled.modules=\ - org.apache.xml.resolver,\ - org.netbeans.api.debugger,\ - org.netbeans.api.xml,\ - org.netbeans.core.execution,\ - org.netbeans.core.ide,\ - org.netbeans.core.multiview,\ - org.netbeans.core.nativeaccess,\ - org.netbeans.core.output2,\ - org.netbeans.insane,\ - org.netbeans.lib.cvsclient,\ - org.netbeans.libs.commons_logging,\ - org.netbeans.libs.freemarker,\ - org.netbeans.libs.ini4j,\ - org.netbeans.libs.jna,\ - org.netbeans.libs.jsch,\ - org.netbeans.libs.jsr223,\ - org.netbeans.libs.lucene,\ - org.netbeans.libs.svnClientAdapter,\ - org.netbeans.libs.xerces,\ - org.netbeans.modules.applemenu,\ - org.netbeans.modules.autoupdate.services,\ - org.netbeans.modules.autoupdate.ui,\ - org.netbeans.modules.classfile,\ - org.netbeans.modules.core.kit,\ - org.netbeans.modules.db,\ - org.netbeans.modules.db.core,\ - org.netbeans.modules.db.drivers,\ - org.netbeans.modules.db.kit,\ - org.netbeans.modules.db.mysql,\ - org.netbeans.modules.db.sql.editor,\ - org.netbeans.modules.db.sql.visualeditor,\ - org.netbeans.modules.dbapi,\ - org.netbeans.modules.defaults,\ - org.netbeans.modules.diff,\ - org.netbeans.modules.editor.bookmarks,\ - org.netbeans.modules.editor.bracesmatching,\ - org.netbeans.modules.editor.codetemplates,\ - org.netbeans.modules.editor.completion,\ - org.netbeans.modules.editor.errorstripe,\ - org.netbeans.modules.editor.errorstripe.api,\ - org.netbeans.modules.editor.guards,\ - org.netbeans.modules.editor.highlights,\ - org.netbeans.modules.editor.macros,\ - org.netbeans.modules.editor.plain,\ - org.netbeans.modules.editor.plain.lib,\ - org.netbeans.modules.editor.structure,\ - org.netbeans.modules.extbrowser,\ - org.netbeans.modules.favorites,\ - org.netbeans.modules.gototest,\ - org.netbeans.modules.httpserver,\ - org.netbeans.modules.ide.kit,\ - org.netbeans.modules.image,\ - org.netbeans.modules.javahelp,\ - org.netbeans.modules.jumpto,\ - org.netbeans.modules.languages,\ - org.netbeans.modules.languages.bat,\ - org.netbeans.modules.languages.diff,\ - org.netbeans.modules.languages.manifest,\ - org.netbeans.modules.languages.sh,\ - org.netbeans.modules.lexer.editorbridge,\ - org.netbeans.modules.lexer.nbbridge,\ - org.netbeans.modules.localhistory,\ - org.netbeans.modules.masterfs,\ - org.netbeans.modules.mercurial,\ - org.netbeans.modules.progress.ui,\ - org.netbeans.modules.project.ant,\ - org.netbeans.modules.project.libraries,\ - org.netbeans.modules.projectui,\ - org.netbeans.modules.projectuiapi,\ - org.netbeans.modules.properties,\ - org.netbeans.modules.properties.syntax,\ - org.netbeans.modules.refactoring.api,\ - org.netbeans.modules.schema2beans,\ - org.netbeans.modules.sendopts,\ - org.netbeans.modules.server,\ - org.netbeans.modules.servletapi,\ - org.netbeans.modules.subversion,\ - org.netbeans.modules.tasklist.kit,\ - org.netbeans.modules.tasklist.projectint,\ - org.netbeans.modules.tasklist.todo,\ - org.netbeans.modules.tasklist.ui,\ - org.netbeans.modules.templates,\ - org.netbeans.modules.timers,\ - org.netbeans.modules.usersguide,\ - org.netbeans.modules.utilities,\ - org.netbeans.modules.utilities.project,\ - org.netbeans.modules.versioning,\ - org.netbeans.modules.versioning.system.cvss,\ - org.netbeans.modules.versioning.util,\ - org.netbeans.modules.web.flyingsaucer,\ - org.netbeans.modules.xml,\ - org.netbeans.modules.xml.axi,\ - org.netbeans.modules.xml.catalog,\ - org.netbeans.modules.xml.core,\ - org.netbeans.modules.xml.lexer,\ - org.netbeans.modules.xml.multiview,\ - org.netbeans.modules.xml.retriever,\ - org.netbeans.modules.xml.schema.completion,\ - org.netbeans.modules.xml.schema.model,\ - org.netbeans.modules.xml.tax,\ - org.netbeans.modules.xml.text,\ - org.netbeans.modules.xml.tools,\ - org.netbeans.modules.xml.wsdl.model,\ - org.netbeans.modules.xml.xam,\ - org.netbeans.modules.xml.xdm,\ - org.netbeans.modules.xsl,\ - org.netbeans.spi.debugger.ui,\ - org.netbeans.spi.editor.hints,\ - org.netbeans.spi.navigator,\ - org.netbeans.spi.palette,\ - org.netbeans.spi.tasklist,\ - org.netbeans.spi.viewmodel,\ - org.netbeans.swing.dirchooser,\ - org.openide.compat,\ - org.openide.util.enumerations -enabled.clusters=\ - ide9,\ - platform8 -nbjdk.active=default -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.xml deleted file mode 100644 index fa24812c85d..00000000000 --- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/project.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.selectioncoordinator - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - - com.sun.hotspot.igv.selectioncoordinator - - - - diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/SelectionCoordinator/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/pom.xml b/src/utils/IdealGraphVisualizer/SelectionCoordinator/pom.xml new file mode 100644 index 00000000000..0ad4c203a1c --- /dev/null +++ b/src/utils/IdealGraphVisualizer/SelectionCoordinator/pom.xml @@ -0,0 +1,90 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + SelectionCoordinator + 1.0-SNAPSHOT + nbm + SelectionCoordinator + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.selectioncoordinator + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java b/src/utils/IdealGraphVisualizer/SelectionCoordinator/src/main/java/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java similarity index 100% rename from src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/src/main/java/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/manifest.mf b/src/utils/IdealGraphVisualizer/SelectionCoordinator/src/main/nbm/manifest.mf similarity index 100% rename from src/utils/IdealGraphVisualizer/SelectionCoordinator/manifest.mf rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/src/main/nbm/manifest.mf diff --git a/src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties b/src/utils/IdealGraphVisualizer/SelectionCoordinator/src/main/resources/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties rename to src/utils/IdealGraphVisualizer/SelectionCoordinator/src/main/resources/com/sun/hotspot/igv/selectioncoordinator/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/build.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/build.xml deleted file mode 100644 index 31a102f060e..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.servercompilerscheduler. - - diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml deleted file mode 100644 index 97fbd021e86..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties deleted file mode 100644 index 18f1a882ca0..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=d1360a65 -build.xml.script.CRC32=a9d94ef8 -build.xml.stylesheet.CRC32=79c3b980 -# 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=d1360a65 -nbproject/build-impl.xml.script.CRC32=52847236 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml deleted file mode 100644 index 966504f462c..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.servercompiler - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.graph - - - - 1.0 - - - - org.openide.util - - - - 8.14.1 - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/pom.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/pom.xml new file mode 100644 index 00000000000..b43145fa974 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/ServerCompiler/pom.xml @@ -0,0 +1,95 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + ServerCompiler + 1.0-SNAPSHOT + nbm + ServerCompiler + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Graph + ${project.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler b/src/utils/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler deleted file mode 100644 index 530080f9f70..00000000000 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler +++ /dev/null @@ -1 +0,0 @@ -com.sun.hotspot.igv.servercompiler.ServerCompilerScheduler diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java similarity index 99% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java index c4639f4b29f..89f442259d0 100644 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java +++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java @@ -31,11 +31,13 @@ import com.sun.hotspot.igv.data.InputNode; import com.sun.hotspot.igv.data.services.Scheduler; import java.util.*; import org.openide.ErrorManager; +import org.openide.util.lookup.ServiceProvider; /** * * @author Thomas Wuerthinger */ +@ServiceProvider(service=Scheduler.class) public class ServerCompilerScheduler implements Scheduler { private static class Node { diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/manifest.mf b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/ServerCompiler/manifest.mf rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/nbm/manifest.mf index 20c6b686833..75bea01d6af 100644 --- a/src/utils/IdealGraphVisualizer/ServerCompiler/manifest.mf +++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/nbm/manifest.mf @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.servercompiler -OpenIDE-Module-Layer: com/sun/hotspot/igv/servercompiler/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/servercompiler/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.servercompiler +OpenIDE-Module-Layer: com/sun/hotspot/igv/servercompiler/layer.xml +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/servercompiler/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/color.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/color.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/colorFrequency.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/colorFrequency.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/colorFrequency.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/colorFrequency.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/difference.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/difference.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/extract-colors.py b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/extract-colors.py similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/extract-colors.py rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/extract-colors.py diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideControl.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideControl.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideControl.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideControl.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideControlEdges.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideControlEdges.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideControlEdges.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideControlEdges.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideData.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideData.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideData.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideData.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideDataEdges.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideDataEdges.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideDataEdges.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideDataEdges.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMemory.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMemory.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMemory.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMemory.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMemoryEdges.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMemoryEdges.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMemoryEdges.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMemoryEdges.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMixed.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMixed.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMixed.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMixed.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMixedEdges.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMixedEdges.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideMixedEdges.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideMixedEdges.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideOther.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideOther.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideOther.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideOther.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideOtherEdges.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideOtherEdges.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/hideOtherEdges.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideOtherEdges.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/onlyControlFlow.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/register.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/register.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/structural.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/structural.filter similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/structural.filter rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/structural.filter diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml rename to src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml diff --git a/src/utils/IdealGraphVisualizer/Settings/build.xml b/src/utils/IdealGraphVisualizer/Settings/build.xml deleted file mode 100644 index 7ba84f5cc6d..00000000000 --- a/src/utils/IdealGraphVisualizer/Settings/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.settings. - - diff --git a/src/utils/IdealGraphVisualizer/Settings/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Settings/nbproject/build-impl.xml deleted file mode 100644 index ca15154cf9f..00000000000 --- a/src/utils/IdealGraphVisualizer/Settings/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Settings/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/genfiles.properties deleted file mode 100644 index d7271112dad..00000000000 --- a/src/utils/IdealGraphVisualizer/Settings/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=8869440a -build.xml.script.CRC32=7ef09117 -build.xml.stylesheet.CRC32=79c3b980 -# 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=8869440a -nbproject/build-impl.xml.script.CRC32=1a0e7f21 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/Settings/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Settings/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Settings/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Settings/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Settings/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Settings/nbproject/project.xml deleted file mode 100644 index 712ec85ba59..00000000000 --- a/src/utils/IdealGraphVisualizer/Settings/nbproject/project.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.settings - - - - org.jdesktop.layout - - - - 1 - 1.16.1 - - - - org.netbeans.modules.options.api - - - - 1 - 1.21.1 - - - - org.openide.awt - - - - 7.30.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - - com.sun.hotspot.igv.settings - - - - diff --git a/src/utils/IdealGraphVisualizer/Settings/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Settings/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Settings/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Settings/pom.xml b/src/utils/IdealGraphVisualizer/Settings/pom.xml new file mode 100644 index 00000000000..97b6e7a7837 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Settings/pom.xml @@ -0,0 +1,115 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Settings + 1.0-SNAPSHOT + nbm + Settings + + UTF-8 + + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-netbeans-modules-options-api + ${netbeans.version} + + + net.java.dev.swing-layout + swing-layout + ${swinglayouts.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-awt + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.settings + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/Settings.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java rename to src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/Settings.java diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewOptionsCategory.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java rename to src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewOptionsCategory.java diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java rename to src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java rename to src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.java diff --git a/src/utils/IdealGraphVisualizer/Settings/manifest.mf b/src/utils/IdealGraphVisualizer/Settings/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/Settings/manifest.mf rename to src/utils/IdealGraphVisualizer/Settings/src/main/nbm/manifest.mf index 15f55c9f985..43f1d40b7d4 100644 --- a/src/utils/IdealGraphVisualizer/Settings/manifest.mf +++ b/src/utils/IdealGraphVisualizer/Settings/src/main/nbm/manifest.mf @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.settings -OpenIDE-Module-Layer: com/sun/hotspot/igv/settings/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/settings/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.settings +OpenIDE-Module-Layer: com/sun/hotspot/igv/settings/layer.xml +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/settings/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties b/src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties rename to src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form b/src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/ViewPanel.form similarity index 100% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form rename to src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/ViewPanel.form diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml b/src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/layer.xml similarity index 66% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml rename to src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/layer.xml index 7b649b15fff..789b0ee8fd8 100644 --- a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml +++ b/src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/layer.xml @@ -2,8 +2,10 @@ - + + + + diff --git a/src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.png b/src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/settings.png similarity index 100% rename from src/utils/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.png rename to src/utils/IdealGraphVisualizer/Settings/src/main/resources/com/sun/hotspot/igv/settings/settings.png diff --git a/src/utils/IdealGraphVisualizer/Util/build.xml b/src/utils/IdealGraphVisualizer/Util/build.xml deleted file mode 100644 index 1af1e360034..00000000000 --- a/src/utils/IdealGraphVisualizer/Util/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.util. - - diff --git a/src/utils/IdealGraphVisualizer/Util/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/Util/nbproject/build-impl.xml deleted file mode 100644 index 8a444c36b55..00000000000 --- a/src/utils/IdealGraphVisualizer/Util/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/Util/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/genfiles.properties deleted file mode 100644 index 494d2b8ef84..00000000000 --- a/src/utils/IdealGraphVisualizer/Util/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=a470a16f -build.xml.script.CRC32=466cf03b -build.xml.stylesheet.CRC32=05353c81 -# 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=a470a16f -nbproject/build-impl.xml.script.CRC32=39f45e01 -nbproject/build-impl.xml.stylesheet.CRC32=3f8b4615 diff --git a/src/utils/IdealGraphVisualizer/Util/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/Util/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/Util/nbproject/project.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/project.properties deleted file mode 100644 index b0194c49776..00000000000 --- a/src/utils/IdealGraphVisualizer/Util/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/Util/nbproject/project.xml b/src/utils/IdealGraphVisualizer/Util/nbproject/project.xml deleted file mode 100644 index c3c3a8567e7..00000000000 --- a/src/utils/IdealGraphVisualizer/Util/nbproject/project.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.util - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - org.netbeans.api.visual - - - - 2.27.1 - - - - org.openide.awt - - - - 7.39.1 - - - - org.openide.nodes - - - - 7.20.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - - com.sun.hotspot.igv.util - - - - diff --git a/src/utils/IdealGraphVisualizer/Util/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/Util/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/Util/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/Util/pom.xml b/src/utils/IdealGraphVisualizer/Util/pom.xml new file mode 100644 index 00000000000..d253fb5c534 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/Util/pom.xml @@ -0,0 +1,120 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + Util + 1.0-SNAPSHOT + nbm + Util + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-actions + ${netbeans.version} + + + org.netbeans.api + org-netbeans-api-visual + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-nodes + ${netbeans.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.util + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/BoundedZoomAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/BoundedZoomAction.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ColorIcon.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ColorIcon.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ContextAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ContextAction.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/DoubleClickAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/DoubleClickAction.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/DoubleClickHandler.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/DoubleClickHandler.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ExtendedSelectAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/ExtendedSelectAction.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/LookupHistory.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/LookupHistory.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/PropertiesSheet.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/PropertiesSheet.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/RangeSlider.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/RangeSlider.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/RangeSliderModel.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/RangeSliderModel.java diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/StringUtils.java similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/StringUtils.java rename to src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/StringUtils.java diff --git a/src/utils/IdealGraphVisualizer/Util/manifest.mf b/src/utils/IdealGraphVisualizer/Util/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/Util/manifest.mf rename to src/utils/IdealGraphVisualizer/Util/src/main/nbm/manifest.mf index 9c10b50e24f..3dcd9729209 100644 --- a/src/utils/IdealGraphVisualizer/Util/manifest.mf +++ b/src/utils/IdealGraphVisualizer/Util/src/main/nbm/manifest.mf @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.util -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/util/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.util +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/util/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties b/src/utils/IdealGraphVisualizer/Util/src/main/resources/com/sun/hotspot/igv/util/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties rename to src/utils/IdealGraphVisualizer/Util/src/main/resources/com/sun/hotspot/igv/util/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/View/build.xml b/src/utils/IdealGraphVisualizer/View/build.xml deleted file mode 100644 index c0c4cd49d7a..00000000000 --- a/src/utils/IdealGraphVisualizer/View/build.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.view. - - diff --git a/src/utils/IdealGraphVisualizer/View/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/View/nbproject/build-impl.xml deleted file mode 100644 index 0de8e534ead..00000000000 --- a/src/utils/IdealGraphVisualizer/View/nbproject/build-impl.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/View/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/View/nbproject/genfiles.properties deleted file mode 100644 index 8d7a4ea4c02..00000000000 --- a/src/utils/IdealGraphVisualizer/View/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=2de95ef6 -build.xml.script.CRC32=31afe4b1 -build.xml.stylesheet.CRC32=79c3b980 -# 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=2de95ef6 -nbproject/build-impl.xml.script.CRC32=fa7a4119 -nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 diff --git a/src/utils/IdealGraphVisualizer/View/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/View/nbproject/platform.properties deleted file mode 100644 index 68ad75e5766..00000000000 --- a/src/utils/IdealGraphVisualizer/View/nbproject/platform.properties +++ /dev/null @@ -1,29 +0,0 @@ -# Deprecated since 5.0u1; for compatibility with 5.0: -disabled.clusters=\ - apisupport1,\ - harness,\ - ide8,\ - java1,\ - nb6.0,\ - profiler2 -disabled.modules=\ - org.netbeans.core.execution,\ - org.netbeans.core.multiview,\ - org.netbeans.core.output2,\ - org.netbeans.modules.applemenu,\ - 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.util.enumerations -enabled.clusters=\ - platform7 -nbjdk.active=JDK_1.6 -nbplatform.active=default diff --git a/src/utils/IdealGraphVisualizer/View/nbproject/project.properties b/src/utils/IdealGraphVisualizer/View/nbproject/project.properties deleted file mode 100644 index b45e3b401e8..00000000000 --- a/src/utils/IdealGraphVisualizer/View/nbproject/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -javac.source=1.8 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/src/utils/IdealGraphVisualizer/View/nbproject/project.xml b/src/utils/IdealGraphVisualizer/View/nbproject/project.xml deleted file mode 100644 index 2167fe69767..00000000000 --- a/src/utils/IdealGraphVisualizer/View/nbproject/project.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - com.sun.hotspot.igv.view - - - - com.sun.hotspot.igv.data - - - - 1.0 - - - - com.sun.hotspot.igv.difference - - - - 1.0 - - - - com.sun.hotspot.igv.filter - - - - 1.0 - - - - com.sun.hotspot.igv.graph - - - - 1.0 - - - - com.sun.hotspot.igv.hierarchicallayout - - - - 1.0 - - - - com.sun.hotspot.igv.layout - - - - 1.0 - - - - com.sun.hotspot.igv.selectioncoordinator - - - - 1.0 - - - - com.sun.hotspot.igv.settings - - - - 1.0 - - - - com.sun.hotspot.igv.svg - - - - 1.0 - - - - com.sun.hotspot.igv.util - - - - 1.0 - - - - org.netbeans.api.visual - - - - 2.27.1 - - - - org.netbeans.spi.quicksearch - - - - 1.0 - - - - org.openide.actions - - - - 6.21.1 - - - - org.openide.awt - - - - 7.30.1 - - - - org.openide.dialogs - - - - 7.18.1 - - - - org.openide.loaders - - - - 7.20.1 - - - - org.openide.nodes - - - - 7.20.1 - - - - org.openide.util - - - - 8.14.1 - - - - org.openide.util.lookup - - - - 8.6.1 - - - - org.openide.windows - - - - 6.39.1 - - - - - com.sun.hotspot.igv.view - - - - diff --git a/src/utils/IdealGraphVisualizer/View/nbproject/suite.properties b/src/utils/IdealGraphVisualizer/View/nbproject/suite.properties deleted file mode 100644 index 29d7cc9bd6f..00000000000 --- a/src/utils/IdealGraphVisualizer/View/nbproject/suite.properties +++ /dev/null @@ -1 +0,0 @@ -suite.dir=${basedir}/.. diff --git a/src/utils/IdealGraphVisualizer/View/pom.xml b/src/utils/IdealGraphVisualizer/View/pom.xml new file mode 100644 index 00000000000..12b2a8678b4 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/View/pom.xml @@ -0,0 +1,190 @@ + + + + + 4.0.0 + + IdealGraphVisualizer-parent + com.sun.hotspot.igv + 1.0-SNAPSHOT + + com.sun.hotspot.igv + View + 1.0-SNAPSHOT + nbm + View + + UTF-8 + + + + com.sun.hotspot.igv + Data + ${project.version} + + + com.sun.hotspot.igv + Difference + ${project.version} + + + com.sun.hotspot.igv + Filter + ${project.version} + + + com.sun.hotspot.igv + Graph + ${project.version} + + + com.sun.hotspot.igv + HierarchicalLayout + ${project.version} + + + com.sun.hotspot.igv + Layout + ${project.version} + + + com.sun.hotspot.igv + SelectionCoordinator + ${project.version} + + + com.sun.hotspot.igv + BatikSVGProxy + ${project.version} + + + com.sun.hotspot.igv + Settings + ${project.version} + + + com.sun.hotspot.igv + Util + ${project.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-windows + ${netbeans.version} + + + org.netbeans.api + org-openide-nodes + ${netbeans.version} + + + org.netbeans.api + org-openide-dialogs + ${netbeans.version} + + + org.netbeans.api + org-netbeans-spi-quicksearch + ${netbeans.version} + + + org.netbeans.api + org-openide-loaders + ${netbeans.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + org.netbeans.api + org-openide-awt + ${netbeans.version} + + + org.netbeans.api + org-openide-actions + ${netbeans.version} + + + org.netbeans.api + org-netbeans-api-visual + ${netbeans.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + + com.sun.hotspot.igv.view + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer b/src/utils/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer deleted file mode 100644 index ad042e6fb3d..00000000000 --- a/src/utils/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer +++ /dev/null @@ -1 +0,0 @@ -com.sun.hotspot.igv.view.GraphViewerImplementation diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/BoundedZoomAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/BoundedZoomAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewer.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewer.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorInputGraphProvider.java similarity index 91% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorInputGraphProvider.java index fd7a19ae718..70da147e534 100644 --- a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java +++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorInputGraphProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,15 +28,19 @@ import com.sun.hotspot.igv.data.InputGraph; import com.sun.hotspot.igv.data.InputNode; import com.sun.hotspot.igv.data.services.InputGraphProvider; import java.util.Set; +import org.openide.util.lookup.ServiceProvider; /** * * @author Thomas Wuerthinger */ +@ServiceProvider(service=InputGraphProvider.class) public class EditorInputGraphProvider implements InputGraphProvider { private EditorTopComponent editor; + public EditorInputGraphProvider() {} + public EditorInputGraphProvider(EditorTopComponent editor) { this.editor = editor; } diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExportCookie.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExportCookie.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExportCookie.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExportCookie.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java similarity index 93% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java index e34f0e7d660..9291c4761a9 100644 --- a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java +++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,11 +30,13 @@ import com.sun.hotspot.igv.settings.Settings; import org.openide.windows.Mode; import org.openide.windows.TopComponent; import org.openide.windows.WindowManager; +import org.openide.util.lookup.ServiceProvider; /** * * @author Thomas Wuerthinger */ +@ServiceProvider(service=GraphViewer.class) public class GraphViewerImplementation implements GraphViewer { @Override diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/NodeQuickSearch.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/NodeQuickSearch.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExportAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExportAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExtractAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExtractAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/HideAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/HideAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/HideDuplicatesAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/MouseOverAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/MouseOverAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/NextDiagramAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/NextDiagramAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/OverviewAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/OverviewAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/PanModeAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/PanModeAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/PredSuccAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/PredSuccAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/SelectionModeAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/SelectionModeAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ShowAllAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ShowAllAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ZoomInAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ZoomInAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ZoomOutAction.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ZoomOutAction.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/BlockWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/BlockWidget.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/SlotWidget.java similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java rename to src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/SlotWidget.java diff --git a/src/utils/IdealGraphVisualizer/View/manifest.mf b/src/utils/IdealGraphVisualizer/View/src/main/nbm/manifest.mf similarity index 97% rename from src/utils/IdealGraphVisualizer/View/manifest.mf rename to src/utils/IdealGraphVisualizer/View/src/main/nbm/manifest.mf index 870dc9065a6..28738c66f16 100644 --- a/src/utils/IdealGraphVisualizer/View/manifest.mf +++ b/src/utils/IdealGraphVisualizer/View/src/main/nbm/manifest.mf @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.sun.hotspot.igv.view -OpenIDE-Module-Layer: com/sun/hotspot/igv/view/layer.xml -OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/view/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - +Manifest-Version: 1.0 +OpenIDE-Module: com.sun.hotspot.igv.view +OpenIDE-Module-Layer: com/sun/hotspot/igv/view/layer.xml +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/view/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/Bundle.properties similarity index 97% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/Bundle.properties index 95b5ed250ab..c421a4074f1 100644 --- a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties +++ b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/Bundle.properties @@ -1,3 +1,3 @@ -HINT_EditorTopComponent=Visualizes a graph. -OpenIDE-Module-Name=View +HINT_EditorTopComponent=Visualizes a graph. +OpenIDE-Module-Name=View CTL_EditorTopComponent=Graph \ No newline at end of file diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/EditorTopComponent.form similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/EditorTopComponent.form diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/actions/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/actions/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.gif diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/expand.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/expand.gif diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/export.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/export.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/extract.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/extract.gif diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/hide.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/hide.gif diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hideDuplicates.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/hideDuplicates.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hideDuplicates.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/hideDuplicates.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/next_diagram.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/next_diagram.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/overview.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/overview.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/pan_mode.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/pan_mode.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/pan_mode.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/pan_mode.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/predsucc.gif b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/predsucc.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/predsucc.gif rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/predsucc.gif diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/prev_diagram.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/prev_diagram.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/selection_mode.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/selection_mode.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/selection_mode.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/selection_mode.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_in.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/zoom_in.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_in.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/zoom_in.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_out.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/zoom_out.png similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoom_out.png rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/zoom_out.png diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/layer.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/layer.xml diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWsmode.xml b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/propertiesWsmode.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWsmode.xml rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/propertiesWsmode.xml diff --git a/src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWstcref.xml b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/propertiesWstcref.xml similarity index 100% rename from src/utils/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/propertiesWstcref.xml rename to src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/propertiesWstcref.xml diff --git a/src/utils/IdealGraphVisualizer/application/pom.xml b/src/utils/IdealGraphVisualizer/application/pom.xml new file mode 100644 index 00000000000..b5422fecb52 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/application/pom.xml @@ -0,0 +1,199 @@ + + + + + 4.0.0 + + com.sun.hotspot.igv + IdealGraphVisualizer-parent + 1.0-SNAPSHOT + + IdealGraphVisualizer-app + nbm-application + IdealGraphVisualizer-app + + UTF-8 + ${project.build.directory}/${brandingToken} + + + + org.netbeans.cluster + platform + ${netbeans.version} + pom + + + ${project.groupId} + branding + ${project.version} + + + org.netbeans.api + org-netbeans-modules-nbjunit + ${netbeans.version} + test + + + ${project.groupId} + Data + ${project.version} + + + ${project.groupId} + Settings + ${project.version} + + + ${project.groupId} + Util + ${project.version} + + + ${project.groupId} + Layout + ${project.version} + + + ${project.groupId} + Difference + ${project.version} + + + ${project.groupId} + NetworkConnection + ${project.version} + + + ${project.groupId} + Coordinator + ${project.version} + + + ${project.groupId} + SelectionCoordinator + ${project.version} + + + ${project.groupId} + Graph + ${project.version} + + + ${project.groupId} + HierarchicalLayout + ${project.version} + + + ${project.groupId} + ControlFlow + ${project.version} + + + ${project.groupId} + Filter + ${project.version} + + + ${project.groupId} + Bytecodes + ${project.version} + + + ${project.groupId} + ServerCompiler + ${project.version} + + + ${project.groupId} + FilterWindow + ${project.version} + + + ${project.groupId} + Graal + ${project.version} + + + ${project.groupId} + BatikSVGProxy + ${project.version} + + + ${project.groupId} + View + ${project.version} + + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.2 + + + ${all.clusters} + ${brandingToken} + + + + + + + + deployment + + + + org.apache.netbeans.utilities + nbm-maven-plugin + + + extra + + autoupdate + webstart-app + build-installers + + + + + + + + + diff --git a/src/utils/IdealGraphVisualizer/branding.jnlp b/src/utils/IdealGraphVisualizer/branding.jnlp deleted file mode 100644 index ee4c91c4888..00000000000 --- a/src/utils/IdealGraphVisualizer/branding.jnlp +++ /dev/null @@ -1,15 +0,0 @@ - - - - - ${app.title} - ${app.title} vendor - ${app.name} application - - - ${jnlp.permissions} - - ${jnlp.branding.jars} - - - diff --git a/src/utils/IdealGraphVisualizer/branding/pom.xml b/src/utils/IdealGraphVisualizer/branding/pom.xml new file mode 100644 index 00000000000..67821ff4621 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/branding/pom.xml @@ -0,0 +1,66 @@ + + + + + 4.0.0 + + com.sun.hotspot.igv + IdealGraphVisualizer-parent + 1.0-SNAPSHOT + + com.sun.hotspot.igv + branding + 1.0-SNAPSHOT + nbm + branding + + UTF-8 + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + diff --git a/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties rename to src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif b/src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif rename to src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif diff --git a/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame32.gif b/src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame32.gif rename to src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif diff --git a/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame48.gif b/src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame48.gif rename to src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif diff --git a/src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif similarity index 100% rename from src/utils/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif rename to src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif diff --git a/src/utils/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties similarity index 100% rename from src/utils/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties rename to src/utils/IdealGraphVisualizer/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties diff --git a/src/utils/IdealGraphVisualizer/branding/src/main/nbm/manifest.mf b/src/utils/IdealGraphVisualizer/branding/src/main/nbm/manifest.mf new file mode 100644 index 00000000000..b39a40f5657 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/branding/src/main/nbm/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/branding/Bundle.properties +AutoUpdate-Essential-Module: true diff --git a/src/utils/IdealGraphVisualizer/branding/src/main/resources/com/sun/hotspot/igv/branding/Bundle.properties b/src/utils/IdealGraphVisualizer/branding/src/main/resources/com/sun/hotspot/igv/branding/Bundle.properties new file mode 100644 index 00000000000..e9991764a26 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/branding/src/main/resources/com/sun/hotspot/igv/branding/Bundle.properties @@ -0,0 +1,5 @@ +# Localized module labels. Defaults taken from POM (, , ) if unset. +#OpenIDE-Module-Name= +#OpenIDE-Module-Short-Description= +#OpenIDE-Module-Long-Description= +#OpenIDE-Module-Display-Category= diff --git a/src/utils/IdealGraphVisualizer/build.xml b/src/utils/IdealGraphVisualizer/build.xml deleted file mode 100644 index 5e870710a75..00000000000 --- a/src/utils/IdealGraphVisualizer/build.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Builds the module suite IdealGraphVisualizer. - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/igv.sh b/src/utils/IdealGraphVisualizer/igv.sh index ce7487b55f5..4d931e2815c 100644 --- a/src/utils/IdealGraphVisualizer/igv.sh +++ b/src/utils/IdealGraphVisualizer/igv.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -19,5 +19,5 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -ant run >.igv.log 2>&1 +mvn --batch-mode -f application/pom.xml nbm:run-platform >.igv.log 2>&1 diff --git a/src/utils/IdealGraphVisualizer/master.jnlp b/src/utils/IdealGraphVisualizer/master.jnlp deleted file mode 100644 index 5e9dbd6d1d1..00000000000 --- a/src/utils/IdealGraphVisualizer/master.jnlp +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Ideal Graph Visualizer - Ideal Graph Visualizer Team - A graph visualization tool designed for analyzing evolving compiler graphs. It was originally designed for the ideal graph in the HotSpot server compiler, but can be used to visualize arbitrary graph data structures. - - - - - - - - - - - - - - - --branding - ${branding.token} - - diff --git a/src/utils/IdealGraphVisualizer/nbproject/build-impl.xml b/src/utils/IdealGraphVisualizer/nbproject/build-impl.xml deleted file mode 100644 index 9d37f9ac4ac..00000000000 --- a/src/utils/IdealGraphVisualizer/nbproject/build-impl.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/nbproject/genfiles.properties b/src/utils/IdealGraphVisualizer/nbproject/genfiles.properties deleted file mode 100644 index a698bb2daa9..00000000000 --- a/src/utils/IdealGraphVisualizer/nbproject/genfiles.properties +++ /dev/null @@ -1,11 +0,0 @@ -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=3c2c6126 -nbproject/build-impl.xml.script.CRC32=b26e57e5 -nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.62.1 -nbproject/platform.xml.data.CRC32=3c2c6126 -nbproject/platform.xml.script.CRC32=6dcbd131 -nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.62.1 diff --git a/src/utils/IdealGraphVisualizer/nbproject/platform.properties b/src/utils/IdealGraphVisualizer/nbproject/platform.properties deleted file mode 100644 index c63a57d8a78..00000000000 --- a/src/utils/IdealGraphVisualizer/nbproject/platform.properties +++ /dev/null @@ -1,18 +0,0 @@ -branding.token=idealgraphvisualizer -cluster.path=\ - ${nbplatform.active.dir}/ide:\ - ${nbplatform.active.dir}/platform -disabled.modules= -nbplatform.active.dir=${suite.dir}/nbplatform -nbplatform.default.netbeans.dest.dir=${suite.dir}/nbplatform -nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness -bootstrap.url=https://repo.maven.apache.org/maven2/org/codehaus/mojo/nbm-maven-harness/7.4/nbm-maven-harness-7.4.jar -autoupdate.catalog.url=https://updates.netbeans.org/netbeans/updates/7.4/uc/final/distribution/catalog.xml.gz -suite.dir=${basedir} -nbplatform.active=default -## Not disabled because of NetBeans bug 206347: -## Applications not using OSGi don't start on NbP 7.1 -# org.netbeans.core.netigso,\ -# org.netbeans.libs.felix,\ -# org.netbeans.libs.osgi,\ - diff --git a/src/utils/IdealGraphVisualizer/nbproject/platform.xml b/src/utils/IdealGraphVisualizer/nbproject/platform.xml deleted file mode 100644 index 020ab53b8ab..00000000000 --- a/src/utils/IdealGraphVisualizer/nbproject/platform.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/utils/IdealGraphVisualizer/nbproject/project.properties b/src/utils/IdealGraphVisualizer/nbproject/project.properties deleted file mode 100644 index 6207b133ff3..00000000000 --- a/src/utils/IdealGraphVisualizer/nbproject/project.properties +++ /dev/null @@ -1,50 +0,0 @@ -app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif -app.name=${branding.token} -app.title=IdealGraphVisualizer -auxiliary.org-netbeans-modules-apisupport-installer.license-type=no -auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false -auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true -auxiliary.org-netbeans-modules-apisupport-installer.os-windows=false -auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml -modules=\ - ${project.com.sun.hotspot.igv.graph}:\ - ${project.com.sun.hotspot.igv.coordinator}:\ - ${project.com.sun.hotspot.igv.filter}:\ - ${project.com.sun.hotspot.igv.hierarchicallayout}:\ - ${project.com.sun.hotspot.igv.layout}:\ - ${project.com.sun.hotspot.igv.controlflow}:\ - ${project.com.sun.hotspot.igv.data}:\ - ${project.com.sun.hotspot.igv.view}:\ - ${project.com.sun.hotspot.igv.bytecodes}:\ - ${project.com.sun.hotspot.igv.difference}:\ - ${project.com.sun.hotspot.igv.settings}:\ - ${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.filterwindow}:\ - ${project.com.sun.hotspot.igv.selectioncoordinator}:\ - ${project.com.sun.hotspot.igv.graal} -project.com.sun.hotspot.connection=NetworkConnection -project.com.sun.hotspot.igv.bytecodes=Bytecodes -project.com.sun.hotspot.igv.controlflow=ControlFlow -project.com.sun.hotspot.igv.coordinator=Coordinator -project.com.sun.hotspot.igv.data=Data -project.com.sun.hotspot.igv.difference=Difference -project.com.sun.hotspot.igv.filter=Filter -project.com.sun.hotspot.igv.filterwindow=FilterWindow -project.com.sun.hotspot.igv.graal=Graal -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.selectioncoordinator=SelectionCoordinator -project.com.sun.hotspot.igv.servercompilerscheduler=ServerCompiler -project.com.sun.hotspot.igv.settings=Settings -project.com.sun.hotspot.igv.svg=BatikSVGProxy -project.com.sun.hotspot.igv.view=View -project.com.sun.hotspot.igv.util=Util - -# Disable assertions for RequestProcessor to prevent annoying messages in case -# of multiple SceneAnimator update tasks in the default RequestProcessor. -run.args.extra = -J-server -J-da:org.openide.util.RequestProcessor -J-Xms2g -J-Xmx8g -J-Djava.lang.Integer.IntegerCache.high=200000 -debug.args.extra = -J-server -J-da:org.openide.util.RequestProcessor diff --git a/src/utils/IdealGraphVisualizer/nbproject/project.xml b/src/utils/IdealGraphVisualizer/nbproject/project.xml deleted file mode 100644 index 47400216ae9..00000000000 --- a/src/utils/IdealGraphVisualizer/nbproject/project.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - org.netbeans.modules.apisupport.project.suite - - - IdealGraphVisualizer - - - diff --git a/src/utils/IdealGraphVisualizer/pom.xml b/src/utils/IdealGraphVisualizer/pom.xml new file mode 100644 index 00000000000..c1b1896dde4 --- /dev/null +++ b/src/utils/IdealGraphVisualizer/pom.xml @@ -0,0 +1,101 @@ + + + + + 4.0.0 + com.sun.hotspot.igv + IdealGraphVisualizer-parent + 1.0-SNAPSHOT + pom + IdealGraphVisualizer-parent + + + + + org.apache.netbeans.utilities + nbm-maven-plugin + ${nbmmvnplugin.version} + true + + ${brandingToken} + ${brandingToken} + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mvncompilerplugin.version} + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvnjarplugin.version} + + + + + + branding + application + Data + Settings + Util + Layout + Difference + NetworkConnection + Coordinator + SelectionCoordinator + Graph + HierarchicalLayout + ControlFlow + Filter + Bytecodes + ServerCompiler + FilterWindow + Graal + BatikSVGProxy + View + + + RELEASE123 + 1.0.2 + 4.3 + 3.8.1 + 3.1.2 + 4.13.2 + idealgraphvisualizer + +