Merge pull request #3 from thurka/main

Bugfixes and various improvements

Author: jbachorik

btrace.api.integration/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: true
+AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.openjdk.btrace.visualvm.api
 OpenIDE-Module-Localizing-Bundle: org/openjdk/btrace/visualvm/api/Bundle.properties
 OpenIDE-Module-Specification-Version: 2.2.0

btrace.api.integration/nbproject/project.properties

@@ -1,10 +1,11 @@
 cp.extra=${tools.jar}
 
+is.autoload=true
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE.txt
 nbm.homepage=https://github.com/btraceio/btrace
 nbm.module.author=Jaroslav Bachorik
-release.external/btrace-agent-2.2.0.jar=modules/ext/btrace-agent-2.2.0.jar
-release.external/btrace-boot-2.2.0.jar=modules/ext/btrace-boot-2.2.0.jar
-release.external/btrace-client-2.2.0.jar=modules/ext/btrace-client-2.2.0.jar
+release.external/btrace-agent-2.2.0.jar=modules/ext/btrace-agent.jar
+release.external/btrace-boot-2.2.0.jar=modules/ext/btrace-boot.jar
+release.external/btrace-client-2.2.0.jar=modules/ext/btrace-client.jar

btrace.api.integration/nbproject/project.xml

@@ -66,15 +66,15 @@
                 <package>org.openjdk.btrace.visualvm.api.resources</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/btrace-client-2.2.0.jar</runtime-relative-path>
+                <runtime-relative-path>ext/btrace-client.jar</runtime-relative-path>
                 <binary-origin>external/btrace-client-2.2.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/btrace-agent-2.2.0.jar</runtime-relative-path>
+                <runtime-relative-path>ext/btrace-agent.jar</runtime-relative-path>
                 <binary-origin>external/btrace-agent-2.2.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/btrace-boot-2.2.0.jar</runtime-relative-path>
+                <runtime-relative-path>ext/btrace-boot.jar</runtime-relative-path>
                 <binary-origin>external/btrace-boot-2.2.0.jar</binary-origin>
             </class-path-extension>
         </data>

btrace.api.integration/src/org/openjdk/btrace/visualvm/api/options/impl/BTraceOptionsCategory.java

@@ -34,6 +34,12 @@
  *
  * @author Jaroslav Bachorik <jaroslav.bachorik@sun.com>
  */
+@OptionsPanelController.TopLevelRegistration(
+         id = "BTraceOptions",
+         categoryName = "#BTrace",
+         iconBase = "org/openjdk/btrace/visualvm/api/resources/btrace.png",
+         position = 7000
+)
 public class BTraceOptionsPanelController extends OptionsPanelController {
 
     private BTraceCustomizer panel;

btrace.api.integration/src/org/openjdk/btrace/visualvm/api/options/impl/BTraceOptionsPanelController.java

@@ -0,0 +1,7 @@
+
+BTraceCustomizer.dumpClassPath.text=
+BTraceCustomizer.debugCheck.text=Debug Mode
+BTraceCustomizer.dumpCheck.text=Dump Generated Classes
+BTraceCustomizer.dumpClassPathLabel.text=Dump Classes To
+
+BTrace=BTrace

btrace.api.integration/src/org/openjdk/btrace/visualvm/api/options/impl/Bundle.properties

@@ -41,7 +41,7 @@ public BTraceTaskDescriptor(BTraceTaskDS dataSource) {
 
     @Override
     public Image getIcon() {
-        return ImageUtilities.loadImage("/org/openjdk/btrace/visualvm/api/resources/btrace.png", true);
+        return ImageUtilities.loadImage("org/openjdk/btrace/visualvm/resources/btrace_icon.png", true);
     }
 
     @Override

btrace.api.integration/src/org/openjdk/btrace/visualvm/api/resources/btrace.png

@@ -73,8 +73,8 @@ public class BTraceTaskEditorPanel extends javax.swing.JPanel implements BTraceT
     final private static String EDITOR_LAST_SCRIPT = "editor.lastOpened";
 
     final private static String SCRIPT_TEMPLATE = "/* BTrace Script Template */\n" +
-            "import com.sun.btrace.annotations.*;\n" +
-            "import static com.sun.btrace.BTraceUtils.*;\n\n" +
+            "import org.openjdk.btrace.core.annotations.*;\n" +
+            "import static org.openjdk.btrace.core.BTraceUtils.*;\n\n" +
             "@BTrace\n" +
             "public class TracingScript {\n" +
             "\t/* put your code here */\n" +