Merge remote-tracking branch 'origin/master' into BETA_JAVA9
diff --git a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
index 1eb50ea..f481b19 100644
--- a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.10.100.qualifier
Bundle-ClassPath: javadebugtests.jar
Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index fce18d3..f71e8dc 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.tests</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>3.10.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.tests/testresources/JarRefProject/bin/a/RunJar.class b/org.eclipse.jdt.debug.tests/testresources/JarRefProject/bin/a/RunJar.class
new file mode 100644
index 0000000..14e9fd0
--- /dev/null
+++ b/org.eclipse.jdt.debug.tests/testresources/JarRefProject/bin/a/RunJar.class
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsBreakpointConditions.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsBreakpointConditions.java
index 14b6046..76efae8 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsBreakpointConditions.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsBreakpointConditions.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 IBM Corporation and others.
+ * Copyright (c) 2015, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,4 +64,19 @@
}
}
+ /*
+ * To test throw as a last statement
+ */
+ public void testCondition4() throws Throwable {
+ try {
+ init();
+ IValue value = eval("System.out.println(\"test\");throw new Exception(\"test\")");
+ System.out.println(value);
+
+ }
+ finally {
+ end();
+ }
+
+ }
}
diff --git a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
index d505bb5..3f45b7a 100644
--- a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
-Bundle-Version: 3.7.200.qualifier
+Bundle-Version: 3.8.0.qualifier
Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.jdt.debug.ui,
org.eclipse.jdt.debug.ui.actions,
org.eclipse.jdt.debug.ui.breakpoints,
+ org.eclipse.jdt.debug.ui.console,
org.eclipse.jdt.debug.ui.launchConfigurations,
org.eclipse.jdt.internal.debug.core.refactoring;x-internal:=true,
org.eclipse.jdt.internal.debug.ui;x-internal:=true,
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co.png
new file mode 100644
index 0000000..cfbdd66
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/constant_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.png
new file mode 100644
index 0000000..aaa0c1a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch@2x.png
new file mode 100644
index 0000000..c4e3fac
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.png
new file mode 100644
index 0000000..dedb799
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.png
new file mode 100644
index 0000000..3df9a2d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co@2x.png
new file mode 100644
index 0000000..7d3411b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co.png
new file mode 100644
index 0000000..9f90ea8
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co@2x.png
new file mode 100644
index 0000000..0c3524a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/suspend_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.png
new file mode 100644
index 0000000..0157f6e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.png
new file mode 100644
index 0000000..fa1fe6b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.png
new file mode 100644
index 0000000..c3b0a18
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet.png
new file mode 100644
index 0000000..d329a42
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_applet.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.png
new file mode 100644
index 0000000..002a532
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.png
new file mode 100644
index 0000000..2279f74
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.png
new file mode 100644
index 0000000..d3a0590
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp.png
new file mode 100644
index 0000000..52c00d0
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp@2x.png b/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp@2x.png
new file mode 100644
index 0000000..5ce0c4a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/dtool16/watch_exp@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances.png
new file mode 100644
index 0000000..0c64ad1
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_instances.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references.png
new file mode 100644
index 0000000..fad6f83
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/all_references.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu.png
new file mode 100644
index 0000000..a93e894
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/autoform_menu.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co.png
new file mode 100644
index 0000000..8c72bed
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/constant_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.png
new file mode 100644
index 0000000..eda907d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch@2x.png
new file mode 100644
index 0000000..e5ebb00
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.png
new file mode 100644
index 0000000..dd0497a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co@2x.png
new file mode 100644
index 0000000..cbf5e1c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.png
new file mode 100644
index 0000000..2c8726a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.png
new file mode 100644
index 0000000..7eaf952
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co@2x.png
new file mode 100644
index 0000000..101bd11
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co.png
new file mode 100644
index 0000000..f7c9eae
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co@2x.png
new file mode 100644
index 0000000..9952c26
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/suspend_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.png
new file mode 100644
index 0000000..0aa158d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr@2x.png b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr@2x.png
new file mode 100644
index 0000000..ef3ac83
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png
new file mode 100644
index 0000000..694fe36
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.png
new file mode 100644
index 0000000..e936fba
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.png
new file mode 100644
index 0000000..e491d06
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet.png
new file mode 100644
index 0000000..dad7e1e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_applet.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.png
new file mode 100644
index 0000000..b3cb48b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.png
new file mode 100644
index 0000000..9d7dbbe
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.png
new file mode 100644
index 0000000..cfbf9d1
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp.png
new file mode 100644
index 0000000..a9327be
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp@2x.png b/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp@2x.png
new file mode 100644
index 0000000..657d228
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/etool16/watch_exp@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab.png b/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab.png
new file mode 100644
index 0000000..9a44e10
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/eview16/variable_tab.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/brkp_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkp_obj.png
new file mode 100644
index 0000000..26dc3cf
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkp_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/brkp_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkp_obj@2x.png
new file mode 100644
index 0000000..d6fe105
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkp_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/class_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/class_obj.png
new file mode 100644
index 0000000..b763245
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/class_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/class_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/class_obj@2x.png
new file mode 100644
index 0000000..aaf6754
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/class_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj.png
new file mode 100644
index 0000000..9557b04
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/classpath_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj.png
new file mode 100644
index 0000000..1f5638b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/contended_monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/envvar_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/envvar_obj.png
new file mode 100644
index 0000000..1a303de
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/envvar_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/envvar_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/envvar_obj@2x.png
new file mode 100644
index 0000000..94dabbf
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/envvar_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook.png
new file mode 100644
index 0000000..1a9271c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/insp_sbook.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jar_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jar_obj.png
new file mode 100644
index 0000000..9af0443
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jar_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jar_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jar_obj@2x.png
new file mode 100644
index 0000000..40b41f8
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jar_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexcept_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexcept_obj.png
new file mode 100644
index 0000000..2d07a1e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexcept_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj.png
new file mode 100644
index 0000000..147295f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj@2x.png
new file mode 100644
index 0000000..be70c0a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.png
new file mode 100644
index 0000000..785eb8a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj@2x.png
new file mode 100644
index 0000000..0be6aa1
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj.png
new file mode 100644
index 0000000..fe55c43
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jline_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj.png
new file mode 100644
index 0000000..8c6a3e1
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jload_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj.png
new file mode 100644
index 0000000..5f1afe6
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jmeth_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj.png
new file mode 100644
index 0000000..c7b393d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj@2x.png
new file mode 100644
index 0000000..0f888d3
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.png
new file mode 100644
index 0000000..b89a649
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.png
new file mode 100644
index 0000000..de97cd7
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj.png
new file mode 100644
index 0000000..6644b96
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jspbrkpt_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj.png
new file mode 100644
index 0000000..8307428
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/jwatch_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/library_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/library_obj.png
new file mode 100644
index 0000000..cfa012c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/library_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/library_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/library_obj@2x.png
new file mode 100644
index 0000000..19c7938
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/library_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/localvariable_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/localvariable_obj.png
new file mode 100644
index 0000000..a496c2b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/localvariable_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/localvariable_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/localvariable_obj@2x.png
new file mode 100644
index 0000000..8f14d23
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/localvariable_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj.png
new file mode 100644
index 0000000..c11b767
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj.png
new file mode 100644
index 0000000..cfb8a11
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/owned_monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/package_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/package_obj.png
new file mode 100644
index 0000000..8a55b1a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/package_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/package_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/package_obj@2x.png
new file mode 100644
index 0000000..6a6a987
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/package_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/prj_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/prj_obj.png
new file mode 100644
index 0000000..812b263
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/prj_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/prj_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/prj_obj@2x.png
new file mode 100644
index 0000000..a9d9ba0
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/prj_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj.png
new file mode 100644
index 0000000..0e8e11f
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj@2x.png
new file mode 100644
index 0000000..2a367f0
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj.png
new file mode 100644
index 0000000..ed03ca0
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_and_monitor_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj.png
new file mode 100644
index 0000000..60ccb7e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj@2x.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj@2x.png
new file mode 100644
index 0000000..4360987
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/thread_obj@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj.png b/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj.png
new file mode 100644
index 0000000..c7db78e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/obj16/threadgroup_obj.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.png
new file mode 100644
index 0000000..97faa0b
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.png
new file mode 100644
index 0000000..27f7dd9
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.png
new file mode 100644
index 0000000..fbb326a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.png
new file mode 100644
index 0000000..d9a1f0d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr.png
new file mode 100644
index 0000000..a9fb776
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contention_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr.png
new file mode 100644
index 0000000..c5b975e
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/contentionformonitor_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr.png
new file mode 100644
index 0000000..3ad81a1
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/deadlock_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.png
new file mode 100644
index 0000000..d57e6f2
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.png
new file mode 100644
index 0000000..2f22f66
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co.png
new file mode 100644
index 0000000..519dbf9
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co@2x.png
new file mode 100644
index 0000000..517efcc
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.png
new file mode 100644
index 0000000..d7f0d5a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.png
new file mode 100644
index 0000000..08bb335
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.png
new file mode 100644
index 0000000..1764c9a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.png
new file mode 100644
index 0000000..1cdb362
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr.png
new file mode 100644
index 0000000..d15e6e8
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/owned_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr.png
new file mode 100644
index 0000000..a3bc4c6
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/ownsmonitor_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.png
new file mode 100644
index 0000000..13de7f2
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.png
new file mode 100644
index 0000000..fb5815c
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr.png
new file mode 100644
index 0000000..9809abb
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/sync_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.png
new file mode 100644
index 0000000..cc7ad8d
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.png
new file mode 100644
index 0000000..fbc3432
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co.png
new file mode 100644
index 0000000..568af1a
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co@2x.png b/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co@2x.png
new file mode 100644
index 0000000..bfb0360
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co@2x.png
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/plugin.xml b/org.eclipse.jdt.debug.ui/plugin.xml
index d25b659..24ee7d5 100644
--- a/org.eclipse.jdt.debug.ui/plugin.xml
+++ b/org.eclipse.jdt.debug.ui/plugin.xml
@@ -40,7 +40,7 @@
point="org.eclipse.ui.editors">
<editor
name="%JavaSnippetEditor.label"
- icon="$nl$/icons/full/obj16/jsbook_obj.gif"
+ icon="$nl$/icons/full/obj16/jsbook_obj.png"
extensions="jpage"
contributorClass="org.eclipse.jdt.internal.debug.ui.snippeteditor.SnippetEditorActionContributor"
class="org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor"
@@ -76,11 +76,11 @@
<action
toolbarPath="evaluationGroup"
id="org.eclipse.jdt.debug.ui.SnippetExecute"
- hoverIcon="$nl$/icons/full/etool16/run_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/run_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
- disabledIcon="$nl$/icons/full/dtool16/run_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/run_sbook.png"
enablesFor="+"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
helpContextId="execute_action_context"
label="%Execute.label"
tooltip="%Execute.tooltip">
@@ -91,11 +91,11 @@
<action
toolbarPath="evaluationGroup"
id="org.eclipse.jdt.debug.ui.SnippetDisplay"
- hoverIcon="$nl$/icons/full/etool16/disp_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/disp_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
- disabledIcon="$nl$/icons/full/dtool16/disp_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/disp_sbook.png"
enablesFor="+"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
helpContextId="display_action_context"
label="%Display.label"
tooltip="%Display.tooltip">
@@ -106,11 +106,11 @@
<action
toolbarPath="evaluationGroup"
id="org.eclipse.jdt.debug.ui.SnippetInspect"
- hoverIcon="$nl$/icons/full/etool16/insp_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/insp_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
- disabledIcon="$nl$/icons/full/dtool16/insp_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/insp_sbook.png"
enablesFor="+"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="inspect_action_context"
label="%Inspect.label"
tooltip="%Inspect.tooltip">
@@ -137,7 +137,7 @@
<action
definitionId="org.eclipse.jdt.debug.ui.commands.AddClassPrepareBreakpoint"
label="%classPrepareAction.label"
- icon="$nl$/icons/full/obj16/class_obj.gif"
+ icon="$nl$/icons/full/obj16/class_obj.png"
helpContextId="add_class_prepare_action_context"
class="org.eclipse.jdt.internal.debug.ui.breakpoints.AddClassPrepareBreakpointAction"
menubarPath="org.eclipse.ui.run/breakpointGroup"
@@ -146,7 +146,7 @@
<action
definitionId="org.eclipse.jdt.debug.ui.commands.AddExceptionBreakpoint"
label="%exceptionAction.accel.label"
- icon="$nl$/icons/full/elcl16/exc_catch.gif"
+ icon="$nl$/icons/full/elcl16/exc_catch.png"
helpContextId="add_exception_action_context"
class="org.eclipse.jdt.internal.debug.ui.breakpoints.AddExceptionAction"
menubarPath="org.eclipse.ui.run/breakpointGroup"
@@ -177,12 +177,12 @@
</action>
<action
id="org.eclipse.jdt.debug.ui.actions.Execute"
- hoverIcon="$nl$/icons/full/etool16/run_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/run_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
definitionId="org.eclipse.jdt.debug.ui.commands.Execute"
- disabledIcon="$nl$/icons/full/dtool16/run_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/run_sbook.png"
enablesFor="+"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
label="%Execute.label"
helpContextId="execute_action_context"
menubarPath="org.eclipse.ui.run/jdtGroup">
@@ -206,11 +206,11 @@
</action>
<action
id="org.eclipse.jdt.debug.ui.actions.Display"
- hoverIcon="$nl$/icons/full/etool16/disp_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/disp_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
definitionId="org.eclipse.jdt.debug.ui.commands.Display"
- disabledIcon="$nl$/icons/full/dtool16/disp_sbook.gif"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/disp_sbook.png"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
label="%Display.label"
helpContextId="display_action_context"
menubarPath="org.eclipse.ui.run/jdtGroup">
@@ -234,11 +234,11 @@
</action>
<action
id="org.eclipse.jdt.debug.ui.actions.Inspect"
- hoverIcon="$nl$/icons/full/etool16/insp_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/insp_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
definitionId="org.eclipse.jdt.debug.ui.commands.Inspect"
- disabledIcon="$nl$/icons/full/dtool16/insp_sbook.gif"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/insp_sbook.png"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
label="%Inspect.label"
helpContextId="inspect_action_context"
menubarPath="org.eclipse.ui.run/jdtGroup">
@@ -268,10 +268,10 @@
<action
class="org.eclipse.jdt.internal.debug.ui.actions.WatchAction"
definitionId="org.eclipse.jdt.debug.ui.commands.Watch"
- disabledIcon="$nl$/icons/full/dtool16/watch_exp.gif"
+ disabledIcon="$nl$/icons/full/dtool16/watch_exp.png"
helpContextId="watch_action_context"
- hoverIcon="$nl$/icons/full/etool16/watch_exp.gif"
- icon="$nl$/icons/full/etool16/watch_exp.gif"
+ hoverIcon="$nl$/icons/full/etool16/watch_exp.png"
+ icon="$nl$/icons/full/etool16/watch_exp.png"
id="org.eclipse.jdt.debug.ui.Watch"
label="%Watch.label"
menubarPath="org.eclipse.ui.run/jdtGroup">
@@ -331,7 +331,7 @@
class="org.eclipse.jdt.internal.debug.ui.heapwalking.AllInstancesActionDelegate"
definitionId="org.eclipse.jdt.debug.ui.commands.AllInstances"
helpContextId="all_instances_action_context"
- icon="icons/full/elcl16/all_instances.gif"
+ icon="icons/full/elcl16/all_instances.png"
id="org.eclipse.jdt.debug.ui.actions.AllInstances"
label="%allInstances.label"
menubarPath="org.eclipse.ui.run/jdtGroup"
@@ -367,7 +367,7 @@
class="org.eclipse.jdt.internal.debug.ui.heapwalking.AllReferencesActionDelegate"
definitionId="org.eclipse.jdt.debug.ui.commands.AllReferences"
helpContextId="all_references_action_context"
- icon="icons/full/elcl16/all_references.gif"
+ icon="icons/full/elcl16/all_references.png"
id="org.eclipse.jdt.debug.ui.actions.AllReferences"
label="%allReferences.label"
menubarPath="org.eclipse.ui.run/jdtGroup"
@@ -495,7 +495,7 @@
point="org.eclipse.ui.views">
<view
name="%displayViewName"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
category="org.eclipse.debug.ui"
class="org.eclipse.jdt.internal.debug.ui.display.DisplayView"
id="org.eclipse.jdt.debug.ui.DisplayView">
@@ -868,7 +868,7 @@
id="org.eclipse.jdt.debug.ui.JavaVariableActions">
<action
label="%Inspect.label"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="variable_inspect_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Inspect"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
@@ -905,7 +905,7 @@
id="org.eclipse.jdt.debug.ui.JavaSnippetPopupActions">
<action
label="%Execute.label"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
helpContextId="execute_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Execute"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
@@ -918,7 +918,7 @@
</action>
<action
label="%Display.label"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
helpContextId="display_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Display"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
@@ -931,7 +931,7 @@
</action>
<action
label="%Inspect.label"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="inspect_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Inspect"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
@@ -963,7 +963,7 @@
<action
class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
helpContextId="manage_breakpoint_action_context"
- icon="icons/full/obj16/brkp_obj.gif"
+ icon="icons/full/obj16/brkp_obj.png"
id="org.eclipse.jdt.debug.ui.actions.BreakpointRulerActionDelegate"
definitionId="org.eclipse.debug.ui.commands.ToggleBreakpoint"
label="%AddBreakpoint.label"
@@ -990,7 +990,7 @@
<action
class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
helpContextId="manage_breakpoint_action_context"
- icon="icons/full/obj16/brkp_obj.gif"
+ icon="icons/full/obj16/brkp_obj.png"
id="org.eclipse.jdt.debug.ui.actions.BreakpointRulerActionDelegate"
definitionId="org.eclipse.debug.ui.commands.ToggleBreakpoint"
label="%AddBreakpoint.label"
@@ -1015,14 +1015,14 @@
class="org.eclipse.debug.ui.actions.RunToLineActionDelegate"
definitionId="org.eclipse.debug.ui.commands.RunToLine"
helpContextId="run_to_line_action_context"
- icon="icons/full/elcl16/runtoline_co.gif"
+ icon="icons/full/elcl16/runtoline_co.png"
id="org.eclipse.jdt.debug.ui.cuPopup.RunToLine"
label="%runToLineAction.label"
menubarPath="java.debug">
</action>
<action
label="%Execute.label"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
helpContextId="execute_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Execute"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
@@ -1031,7 +1031,7 @@
</action>
<action
label="%Display.label"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
helpContextId="display_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Display"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
@@ -1040,7 +1040,7 @@
</action>
<action
label="%Inspect.label"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="inspect_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Inspect"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
@@ -1049,7 +1049,7 @@
</action>
<action
label="%Watch.label"
- icon="$nl$/icons/full/etool16/watch_exp.gif"
+ icon="$nl$/icons/full/etool16/watch_exp.png"
helpContextId="watch_action_context"
class="org.eclipse.jdt.internal.debug.ui.actions.WatchAction"
menubarPath="java.debug"
@@ -1096,7 +1096,7 @@
class="org.eclipse.jdt.internal.debug.ui.heapwalking.AllInstancesActionDelegate"
definitionId="org.eclipse.jdt.debug.ui.commands.AllInstances"
helpContextId="all_instances_action_context"
- icon="icons/full/elcl16/all_instances.gif"
+ icon="icons/full/elcl16/all_instances.png"
id="org.eclipse.jdt.debug.ui.cuPopup.AllInstances"
label="%allInstances.label"
menubarPath="java.debug"
@@ -1121,14 +1121,14 @@
class="org.eclipse.debug.ui.actions.RunToLineActionDelegate"
definitionId="org.eclipse.debug.ui.commands.RunToLine"
helpContextId="run_to_line_action_context"
- icon="icons/full/elcl16/runtoline_co.gif"
+ icon="icons/full/elcl16/runtoline_co.png"
id="org.eclipse.jdt.debug.ui.cuPopup.RunToLine"
label="%runToLineAction.label"
menubarPath="additions">
</action>
<action
label="%Execute.label"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
helpContextId="execute_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Execute"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
@@ -1137,7 +1137,7 @@
</action>
<action
label="%Display.label"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
helpContextId="display_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Display"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
@@ -1146,7 +1146,7 @@
</action>
<action
label="%Inspect.label"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="inspect_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Inspect"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
@@ -1155,7 +1155,7 @@
</action>
<action
label="%Watch.label"
- icon="$nl$/icons/full/etool16/watch_exp.gif"
+ icon="$nl$/icons/full/etool16/watch_exp.png"
helpContextId="watch_action_context"
class="org.eclipse.jdt.internal.debug.ui.actions.WatchAction"
menubarPath="additions"
@@ -1202,7 +1202,7 @@
class="org.eclipse.jdt.internal.debug.ui.heapwalking.AllInstancesActionDelegate"
definitionId="org.eclipse.jdt.debug.ui.commands.AllInstances"
helpContextId="all_instances_action_context"
- icon="icons/full/elcl16/all_instances.gif"
+ icon="icons/full/elcl16/all_instances.png"
id="org.eclipse.jdt.debug.ui.cuPopup.AllInstances"
label="%allInstances.label"
menubarPath="additions"
@@ -1232,7 +1232,7 @@
class="org.eclipse.debug.ui.actions.ToggleMethodBreakpointActionDelegate"
enablesFor="+"
helpContextId="manage_method_breakpoint_action_context"
- icon="icons/full/obj16/brkp_obj.gif"
+ icon="icons/full/obj16/brkp_obj.png"
id="org.eclipse.jdt.debug.ui.MethodBreakpoint"
label="%manageMethodBreakpointAction.label"
menubarPath="additions">
@@ -1264,7 +1264,7 @@
class="org.eclipse.debug.ui.actions.ToggleWatchpointActionDelegate"
enablesFor="+"
helpContextId="manage_watchpoint_action_context"
- icon="icons/full/obj16/readwrite_obj.gif"
+ icon="icons/full/obj16/readwrite_obj.png"
id="org.eclipse.jdt.debug.ui.Watchpoint"
label="%manageWatchpointAction.label"
menubarPath="additions">
@@ -1277,7 +1277,7 @@
class="org.eclipse.jdt.internal.debug.ui.breakpoints.ToggleClassPrepareBreakpointAction"
enablesFor="+"
helpContextId="toggle_class_prepare_action_context"
- icon="icons/full/obj16/class_obj.gif"
+ icon="icons/full/obj16/class_obj.png"
id="org.eclipse.jdt.debug.ui.ToggleClassPrepare"
label="%toggleClassPrepareAction.label"
menubarPath="additions">
@@ -1322,7 +1322,7 @@
class="org.eclipse.debug.ui.actions.ToggleWatchpointActionDelegate"
enablesFor="+"
helpContextId="manage_watchpoint_action_context"
- icon="icons/full/obj16/readwrite_obj.gif"
+ icon="icons/full/obj16/readwrite_obj.png"
id="org.eclipse.jdt.debug.ui.VariableWatchpoint"
label="%manageWatchpointAction.label"
menubarPath="openOnGroup">
@@ -1372,7 +1372,7 @@
definitionId="org.eclipse.jdt.debug.ui.commands.AllInstances"
enablesFor="1"
helpContextId="all_instances_action_context"
- icon="icons/full/elcl16/all_instances.gif"
+ icon="icons/full/elcl16/all_instances.png"
id="org.eclipse.jdt.debug.ui.allInstances"
label="%allInstances.label"
menubarPath="emptyNavigationGroup"
@@ -1405,7 +1405,7 @@
definitionId="org.eclipse.jdt.debug.ui.commands.AllReferences"
enablesFor="1"
helpContextId="all_references_action_context"
- icon="icons/full/elcl16/all_references.gif"
+ icon="icons/full/elcl16/all_references.png"
id="org.eclipse.jdt.debug.ui.actions.AllReferences"
label="%allReferences.label"
menubarPath="emptyNavigationGroup"
@@ -1478,7 +1478,7 @@
id="org.eclipse.jdt.debug.JavaBreakpointActions">
<action
label="%hitCount.label"
- icon="$nl$/icons/full/elcl16/sethitcount_co.gif"
+ icon="$nl$/icons/full/elcl16/sethitcount_co.png"
helpContextId="hit_count_action_context"
class="org.eclipse.jdt.internal.debug.ui.actions.BreakpointHitCountAction"
menubarPath="emptyBreakpointGroup"
@@ -1489,7 +1489,7 @@
class="org.eclipse.jdt.internal.debug.ui.actions.BreakpointSuspendPolicyToggleAction"
enablesFor="1"
helpContextId="breakpoint_suspend_policy_toggle_action_context"
- icon="$nl$/icons/full/elcl16/suspend_co.gif"
+ icon="$nl$/icons/full/elcl16/suspend_co.png"
id="org.eclipse.jdt.debug.ui.actions.SuspendPolicy"
label="%suspendPolicy.label"
menubarPath="emptyBreakpointGroup"
@@ -1621,7 +1621,7 @@
</action>
<action
label="%Execute.label"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
helpContextId="execute_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Execute"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
@@ -1634,7 +1634,7 @@
</action>
<action
label="%Display.label"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
helpContextId="display_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Display"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
@@ -1647,7 +1647,7 @@
</action>
<action
label="%Inspect.label"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="inspect_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Inspect"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
@@ -1696,7 +1696,7 @@
definitionId="org.eclipse.jdt.debug.ui.commands.Watch"
enablesFor="+"
helpContextId="watch_action_context"
- icon="$nl$/icons/full/etool16/watch_exp.gif"
+ icon="$nl$/icons/full/etool16/watch_exp.png"
id="org.eclipse.jdt.debug.ui.displayView.Watch"
label="%Watch.label"
menubarPath="evaluationGroup"
@@ -1721,7 +1721,7 @@
</action>
<action
label="%Execute.label"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
helpContextId="execute_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Execute"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
@@ -1748,7 +1748,7 @@
</action>
<action
label="%Display.label"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
helpContextId="display_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Display"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
@@ -1775,7 +1775,7 @@
</action>
<action
label="%Inspect.label"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="inspect_action_context"
definitionId="org.eclipse.jdt.debug.ui.commands.Inspect"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
@@ -1845,7 +1845,7 @@
definitionId="org.eclipse.jdt.debug.ui.commands.AllInstances"
enablesFor="1"
helpContextId="all_instances_action_context"
- icon="icons/full/elcl16/all_instances.gif"
+ icon="icons/full/elcl16/all_instances.png"
id="org.eclipse.jdt.debug.ui.allInstances"
label="%allInstances.label"
menubarPath="additions"
@@ -1882,7 +1882,7 @@
definitionId="org.eclipse.jdt.debug.ui.commands.AllInstances"
enablesFor="1"
helpContextId="all_instances_action_context"
- icon="icons/full/elcl16/all_instances.gif"
+ icon="icons/full/elcl16/all_instances.png"
id="org.eclipse.jdt.debug.ui.allInstances"
label="%allInstances.label"
menubarPath="additions"
@@ -1905,7 +1905,7 @@
<action
class="org.eclipse.jdt.internal.debug.ui.heapwalking.AllReferencesInViewActionDelegate"
helpContextId="show_references_action_context"
- icon="icons/full/elcl16/all_references.gif"
+ icon="icons/full/elcl16/all_references.png"
id="org.eclipse.jdt.debug.ui.variablesViewActions.AllReferencesInView"
label="%allReferencesInView.label"
menubarPath="org.eclipse.jdt.debug.ui.VariableView.javaSubmenu/javaPart"
@@ -1925,7 +1925,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.variableViewActions.ShowQualified"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction"
- icon="$nl$/icons/full/obj16/package_obj.gif"
+ icon="$nl$/icons/full/obj16/package_obj.png"
helpContextId="show_qualified_action_context"
label="%showQualifiedAction.label"
menubarPath="org.eclipse.jdt.debug.ui.VariableView.javaSubmenu/javaPart"
@@ -1935,7 +1935,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.variableViewActions.ShowStatic"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowStaticVariablesAction"
- icon="$nl$/icons/full/elcl16/static_co.gif"
+ icon="$nl$/icons/full/elcl16/static_co.png"
helpContextId="show_static_action_context"
label="%showStaticAction.label"
menubarPath="org.eclipse.jdt.debug.ui.VariableView.javaSubmenu/javaPart"
@@ -1944,7 +1944,7 @@
<action
class="org.eclipse.jdt.internal.debug.ui.actions.ShowConstantsAction"
helpContextId="show_constants_action_context"
- icon="$nl$/icons/full/elcl16/constant_co.gif"
+ icon="$nl$/icons/full/elcl16/constant_co.png"
id="org.eclipse.jdt.debug.ui.variableViewActions.ShowConstants"
label="%showConstantsAction.label"
menubarPath="org.eclipse.jdt.debug.ui.VariableView.javaSubmenu/javaPart"
@@ -1971,7 +1971,7 @@
<action
class="org.eclipse.jdt.internal.debug.ui.heapwalking.AllReferencesInViewActionDelegate"
helpContextId="show_references_action_context"
- icon="icons/full/elcl16/all_references.gif"
+ icon="icons/full/elcl16/all_references.png"
id="org.eclipse.jdt.debug.ui.expressionViewActions.AllReferencesInView"
label="%allReferencesInView.label"
menubarPath="org.eclipse.jdt.debug.ui.expSubmenu/javaPart"
@@ -1990,7 +1990,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.expressionViewActions.ShowQualified"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction"
- icon="$nl$/icons/full/obj16/package_obj.gif"
+ icon="$nl$/icons/full/obj16/package_obj.png"
helpContextId="show_qualified_action_context"
label="%showQualifiedAction.label"
menubarPath="org.eclipse.jdt.debug.ui.expSubmenu/javaPart"
@@ -2000,7 +2000,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.expressionViewActions.ShowStatic"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowStaticVariablesAction"
- icon="$nl$/icons/full/elcl16/static_co.gif"
+ icon="$nl$/icons/full/elcl16/static_co.png"
helpContextId="show_static_action_context"
label="%showStaticAction.label"
menubarPath="org.eclipse.jdt.debug.ui.expSubmenu/javaPart"
@@ -2010,7 +2010,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.expressionViewActions.ShowConstants"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowConstantsAction"
- icon="$nl$/icons/full/elcl16/constant_co.gif"
+ icon="$nl$/icons/full/elcl16/constant_co.png"
helpContextId="show_constants_action_context"
label="%showConstantsAction.label"
menubarPath="org.eclipse.jdt.debug.ui.expSubmenu/javaPart"
@@ -2029,10 +2029,10 @@
<action
id="org.eclipse.jdt.debug.ui.actions.AddException"
toolbarPath="javaExceptions"
- hoverIcon="$nl$/icons/full/elcl16/exc_catch.gif"
+ hoverIcon="$nl$/icons/full/elcl16/exc_catch.png"
class="org.eclipse.jdt.internal.debug.ui.breakpoints.AddExceptionAction"
- disabledIcon="$nl$/icons/full/dlcl16/exc_catch.gif"
- icon="$nl$/icons/full/elcl16/exc_catch.gif"
+ disabledIcon="$nl$/icons/full/dlcl16/exc_catch.png"
+ icon="$nl$/icons/full/elcl16/exc_catch.png"
helpContextId="add_exception_action_context"
label="%exceptionAction.label"
tooltip="%exceptionAction.tooltip">
@@ -2041,7 +2041,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.breakpointViewActions.ShowQualified"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction"
- icon="$nl$/icons/full/obj16/package_obj.gif"
+ icon="$nl$/icons/full/obj16/package_obj.png"
helpContextId="show_qualified_action_context"
label="%showQualifiedAction.label"
menubarPath="javaActions"
@@ -2055,7 +2055,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.launchViewActions.ShowThreadGroups"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowThreadGroups"
- icon="$nl$/icons/full/obj16/threadgroup_obj.gif"
+ icon="$nl$/icons/full/obj16/threadgroup_obj.png"
helpContextId="show_thread_groups_action_context"
label="%showThreadGroupsAction.label"
menubarPath="org.eclipse.jdt.debug.ui.LaunchView.javaSubmenu/javaPart"
@@ -2065,7 +2065,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.launchViewActions.ShowQualified"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction"
- icon="$nl$/icons/full/obj16/package_obj.gif"
+ icon="$nl$/icons/full/obj16/package_obj.png"
helpContextId="show_qualified_action_context"
label="%showQualifiedAction.label"
menubarPath="org.eclipse.jdt.debug.ui.LaunchView.javaSubmenu/javaPart"
@@ -2075,7 +2075,7 @@
style="toggle"
id="org.eclipse.jdt.debug.ui.launchViewActions.ShowSystemThreads"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowSystemThreadsAction"
- icon="$nl$/icons/full/obj16/thread_obj.gif"
+ icon="$nl$/icons/full/obj16/thread_obj.png"
helpContextId="show_system_threads_action_context"
label="%showSystemThreads.label"
menubarPath="org.eclipse.jdt.debug.ui.LaunchView.javaSubmenu/javaPart"
@@ -2084,7 +2084,7 @@
<action
helpContextId="show_monitors_action_context"
label="%showMonitorThreadInfo.label"
- icon="$nl$/icons/full/obj16/thread_and_monitor_obj.gif"
+ icon="$nl$/icons/full/obj16/thread_and_monitor_obj.png"
tooltip="%showMonitorThreadInfo.tooltip"
class="org.eclipse.jdt.internal.debug.ui.actions.ShowMonitorThreadInformation"
style="toggle"
@@ -2104,11 +2104,11 @@
id="org.eclipse.jdt.debug.ui.DisplayViewActions">
<action
class="org.eclipse.jdt.internal.debug.ui.actions.WatchAction"
- disabledIcon="$nl$/icons/full/dtool16/watch_exp.gif"
+ disabledIcon="$nl$/icons/full/dtool16/watch_exp.png"
enablesFor="+"
helpContextId="watch_action_context"
- hoverIcon="$nl$/icons/full/etool16/watch_exp.gif"
- icon="$nl$/icons/full/etool16/watch_exp.gif"
+ hoverIcon="$nl$/icons/full/etool16/watch_exp.png"
+ icon="$nl$/icons/full/etool16/watch_exp.png"
id="org.eclipse.jdt.debug.ui.displayViewToolbar.Watch"
label="%Watch.label"
toolbarPath="evaluationGroup"
@@ -2134,11 +2134,11 @@
<action
toolbarPath="evaluationGroup"
id="org.eclipse.jdt.debug.ui.displayViewToolbar.Execute"
- hoverIcon="$nl$/icons/full/etool16/run_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/run_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.ExecuteAction"
- disabledIcon="$nl$/icons/full/dtool16/run_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/run_sbook.png"
enablesFor="+"
- icon="$nl$/icons/full/etool16/run_sbook.gif"
+ icon="$nl$/icons/full/etool16/run_sbook.png"
helpContextId="execute_action_context"
label="%Execute.label"
tooltip="%Execute.tooltip">
@@ -2163,11 +2163,11 @@
<action
toolbarPath="evaluationGroup"
id="org.eclipse.jdt.debug.ui.displayViewToolbar.Display"
- hoverIcon="$nl$/icons/full/etool16/disp_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/disp_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupDisplayAction"
- disabledIcon="$nl$/icons/full/dtool16/disp_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/disp_sbook.png"
enablesFor="+"
- icon="$nl$/icons/full/etool16/disp_sbook.gif"
+ icon="$nl$/icons/full/etool16/disp_sbook.png"
helpContextId="display_action_context"
label="%Display.label"
tooltip="%Display.tooltip">
@@ -2192,11 +2192,11 @@
<action
toolbarPath="evaluationGroup"
id="org.eclipse.jdt.debug.ui.displayViewToolbar.Inspect"
- hoverIcon="$nl$/icons/full/etool16/insp_sbook.gif"
+ hoverIcon="$nl$/icons/full/etool16/insp_sbook.png"
class="org.eclipse.jdt.internal.debug.ui.actions.PopupInspectAction"
- disabledIcon="$nl$/icons/full/dtool16/insp_sbook.gif"
+ disabledIcon="$nl$/icons/full/dtool16/insp_sbook.png"
enablesFor="+"
- icon="$nl$/icons/full/etool16/insp_sbook.gif"
+ icon="$nl$/icons/full/etool16/insp_sbook.png"
helpContextId="inspect_action_context"
label="%Inspect.label"
tooltip="%Inspect.tooltip">
@@ -2414,17 +2414,17 @@
<extension
point="org.eclipse.debug.ui.launchConfigurationTypeImages">
<launchConfigurationTypeImage
- icon="$nl$/icons/full/etool16/java_app.gif"
+ icon="$nl$/icons/full/etool16/java_app.png"
configTypeID="org.eclipse.jdt.launching.localJavaApplication"
id="org.eclipse.jdt.debug.ui.launchConfigurationTypeImage.localJavaApplication">
</launchConfigurationTypeImage>
<launchConfigurationTypeImage
- icon="$nl$/icons/full/etool16/java_attach.gif"
+ icon="$nl$/icons/full/etool16/java_attach.png"
configTypeID="org.eclipse.jdt.launching.remoteJavaApplication"
id="org.eclipse.jdt.debug.ui.launchConfigurationTypeImage.remoteJavaApplication">
</launchConfigurationTypeImage>
<launchConfigurationTypeImage
- icon="$nl$/icons/full/etool16/java_applet.gif"
+ icon="$nl$/icons/full/etool16/java_applet.png"
configTypeID="org.eclipse.jdt.launching.javaApplet"
id="org.eclipse.jdt.debug.ui.launchConfigurationTypeImage.javaApplet">
</launchConfigurationTypeImage>
@@ -2515,7 +2515,7 @@
class="org.eclipse.jdt.debug.ui.launchConfigurations.JavaApplicationLaunchShortcut"
description="%JavaLaunchShortcut.description"
helpContextId="org.eclipse.jdt.debug.ui.shortcut_local_java_application"
- icon="$nl$/icons/full/etool16/java_app.gif"
+ icon="$nl$/icons/full/etool16/java_app.png"
id="org.eclipse.jdt.debug.ui.localJavaShortcut"
label="%JavaApplicationShortcut.label"
modes="run, debug">
@@ -2555,7 +2555,7 @@
class="org.eclipse.jdt.debug.ui.launchConfigurations.JavaAppletLaunchShortcut"
description="%AppletLaunchShortcut.description"
helpContextId="org.eclipse.jdt.debug.ui.shortcut_java_applet"
- icon="$nl$/icons/full/etool16/java_applet.gif"
+ icon="$nl$/icons/full/etool16/java_applet.png"
id="org.eclipse.jdt.debug.ui.javaAppletShortcut"
label="%AppletShortcut.label"
modes="run, debug">
@@ -3173,24 +3173,24 @@
<sourceContainerPresentation
containerTypeID="org.eclipse.jdt.launching.sourceContainer.classpathVariable"
browserClass="org.eclipse.jdt.internal.debug.ui.sourcelookup.ClasspathVariableSourceContainerBrowser"
- icon="$nl$/icons/full/obj16/envvar_obj.gif"
+ icon="$nl$/icons/full/obj16/envvar_obj.png"
id="org.eclipse.jdt.debug.ui.sourceContainerPresentation.classpathVariable">
</sourceContainerPresentation>
<sourceContainerPresentation
browserClass="org.eclipse.jdt.internal.debug.ui.sourcelookup.ClasspathContainerSourceContainerBrowser"
containerTypeID="org.eclipse.jdt.launching.sourceContainer.classpathContainer"
- icon="$nl$/icons/full/obj16/library_obj.gif"
+ icon="$nl$/icons/full/obj16/library_obj.png"
id="org.eclipse.jdt.debug.ui.sourceContainerPresentation.classpathContainer">
</sourceContainerPresentation>
<sourceContainerPresentation
browserClass="org.eclipse.jdt.internal.debug.ui.sourcelookup.JavaProjectSourceContainerBrowser"
containerTypeID="org.eclipse.jdt.launching.sourceContainer.javaProject"
- icon="$nl$/icons/full/obj16/prj_obj.gif"
+ icon="$nl$/icons/full/obj16/prj_obj.png"
id="org.eclipse.jdt.debug.ui.sourceContainerPresentation.javaProject">
</sourceContainerPresentation>
<sourceContainerPresentation
containerTypeID="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"
- icon="$nl$/icons/full/obj16/jar_obj.gif"
+ icon="$nl$/icons/full/obj16/jar_obj.png"
id="org.eclipse.jdt.debug.ui.sourceContainerPresentation.packageFragmentRoot">
</sourceContainerPresentation>
</extension>
@@ -3342,7 +3342,7 @@
point="org.eclipse.ui.console.consoleFactories">
<consoleFactory
label="%javaStackTraceConsole.label"
- class="org.eclipse.jdt.internal.debug.ui.console.JavaStackTraceConsoleFactory">
+ class="org.eclipse.jdt.debug.ui.console.JavaStackTraceConsoleFactory">
</consoleFactory>
</extension>
@@ -3453,7 +3453,7 @@
<extension
point="org.eclipse.ui.preferenceTransfer">
<transfer
- icon="$nl$/icons/full/obj16/library_obj.gif"
+ icon="$nl$/icons/full/obj16/library_obj.png"
id="org.eclipse.jdt.debug.ui.transfer.jres"
name="%preference.transfer.jres">
<mapping scope="instance">
@@ -3466,7 +3466,7 @@
</description>
</transfer>
<transfer
- icon="$nl$/icons/full/elcl16/var_cntnt_prvdr.gif"
+ icon="$nl$/icons/full/elcl16/var_cntnt_prvdr.png"
id="org.eclipse.debug.ui.transfer.logicalStructures"
name="%preference.transfer.logicalStructures">
<mapping
@@ -3483,7 +3483,7 @@
</description>
</transfer>
<transfer
- icon="$nl$/icons/full/elcl16/var_cntnt_prvdr.gif"
+ icon="$nl$/icons/full/elcl16/var_cntnt_prvdr.png"
id="org.eclipse.debug.ui.transfer.detail_formatters"
name="%preference.transfer.detail_formatters">
<mapping
diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml
index 4fa381d..647e7b6 100644
--- a/org.eclipse.jdt.debug.ui/pom.xml
+++ b/org.eclipse.jdt.debug.ui/pom.xml
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.ui</artifactId>
- <version>3.7.200-SNAPSHOT</version>
+ <version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<code.ignoredWarnings>-warn:+resource,-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/console/JavaStackTraceConsoleFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/console/JavaStackTraceConsoleFactory.java
new file mode 100644
index 0000000..07eeee2
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/console/JavaStackTraceConsoleFactory.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2016 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jdt.debug.ui.console;
+
+import org.eclipse.jdt.internal.debug.ui.console.JavaStackTraceConsole;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleFactory;
+import org.eclipse.ui.console.IConsoleListener;
+import org.eclipse.ui.console.IConsoleManager;
+
+/**
+ * Creates a new console into which users can paste stack traces and follow the hyperlinks.
+ *
+ * @since 3.8
+ *
+ */
+public class JavaStackTraceConsoleFactory implements IConsoleFactory {
+ private IConsoleManager fConsoleManager = null;
+ private JavaStackTraceConsole fConsole = null;
+
+ public JavaStackTraceConsoleFactory() {
+ fConsoleManager = ConsolePlugin.getDefault().getConsoleManager();
+ fConsoleManager.addConsoleListener(new IConsoleListener() {
+ @Override
+ public void consolesAdded(IConsole[] consoles) {
+ }
+
+ @Override
+ public void consolesRemoved(IConsole[] consoles) {
+ for (int i = 0; i < consoles.length; i++) {
+ if (consoles[i] == fConsole) {
+ fConsole.saveDocument();
+ fConsole = null;
+ }
+ }
+ }
+
+ });
+ }
+
+ /**
+ * Opens the console (creating a new one if not previously initialized).
+ */
+ @Override
+ public void openConsole() {
+ openConsole(null);
+ }
+
+ /**
+ * Opens the console (creating a new one if not previously initialized). If the passed string is not <code>null</code>, the text of the console is
+ * set to the string.
+ *
+ * @param initialText
+ * text to put in the console or <code>null</code>.
+ */
+ public void openConsole(String initialText) {
+ if (fConsole == null) {
+ fConsole = new JavaStackTraceConsole();
+ fConsole.initializeDocument();
+ fConsoleManager.addConsoles(new IConsole[] { fConsole });
+ }
+ if (initialText != null) {
+ fConsole.getDocument().set(initialText);
+ }
+ fConsoleManager.showConsoleView(fConsole);
+ }
+
+
+}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
index 0321cd5..b095e6c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -145,71 +145,71 @@
}
private static void declareImages() {
- declareRegistryImage(IMG_OBJS_EXCEPTION, T_OBJ + "jexception_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_EXCEPTION_DISABLED, T_OBJ + "jexceptiond_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_BREAKPOINT_INSTALLED, T_OVR + "installed_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_BREAKPOINT_INSTALLED_DISABLED, T_OVR + "installed_ovr_disabled.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_EXCEPTION, T_OBJ + "jexception_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_EXCEPTION_DISABLED, T_OBJ + "jexceptiond_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_BREAKPOINT_INSTALLED, T_OVR + "installed_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_BREAKPOINT_INSTALLED_DISABLED, T_OVR + "installed_ovr_disabled.png"); //$NON-NLS-1$
declareRegistryImage(IMG_OBJS_REFERENCE, T_OBJ + "reference_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_LOCAL_VARIABLE, T_OBJ + "localvariable_obj.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_LOCAL_VARIABLE, T_OBJ + "localvariable_obj.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_ENTRY, T_OVR + "entry_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_ENTRY_DISABLED, T_OVR + "entry_ovr_disabled.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_EXIT, T_OVR + "exit_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_EXIT_DISABLED, T_OVR + "exit_ovr_disabled.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_ENTRY, T_OVR + "entry_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_ENTRY_DISABLED, T_OVR + "entry_ovr_disabled.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_EXIT, T_OVR + "exit_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_METHOD_BREAKPOINT_EXIT_DISABLED, T_OVR + "exit_ovr_disabled.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_CONDITIONAL_BREAKPOINT, T_OVR + "conditional_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_CONDITIONAL_BREAKPOINT_DISABLED, T_OVR + "conditional_ovr_disabled.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_CONDITIONAL_BREAKPOINT, T_OVR + "conditional_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_CONDITIONAL_BREAKPOINT_DISABLED, T_OVR + "conditional_ovr_disabled.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_SCOPED_BREAKPOINT, T_OVR + "scoped_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_SCOPED_BREAKPOINT_DISABLED, T_OVR + "scoped_ovr_disabled.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_SCOPED_BREAKPOINT, T_OVR + "scoped_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_SCOPED_BREAKPOINT_DISABLED, T_OVR + "scoped_ovr_disabled.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_UNCAUGHT_BREAKPOINT, T_OVR + "uncaught_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_UNCAUGHT_BREAKPOINT_DISABLED, T_OVR + "uncaught_ovr_disabled.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_UNCAUGHT_BREAKPOINT, T_OVR + "uncaught_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_UNCAUGHT_BREAKPOINT_DISABLED, T_OVR + "uncaught_ovr_disabled.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_CAUGHT_BREAKPOINT, T_OVR + "caught_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_CAUGHT_BREAKPOINT_DISABLED, T_OVR + "caught_ovr_disabled.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_CAUGHT_BREAKPOINT, T_OVR + "caught_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_CAUGHT_BREAKPOINT_DISABLED, T_OVR + "caught_ovr_disabled.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_ERROR, T_OBJ + "jrtexception_obj.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_ERROR, T_OBJ + "jrtexception_obj.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_SNIPPET_EVALUATING, T_OBJ + "jsbook_run_obj.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_SNIPPET_EVALUATING, T_OBJ + "jsbook_run_obj.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_VIEW_ARGUMENTS_TAB, T_EVIEW + "variable_tab.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_VIEW_ARGUMENTS_TAB, T_EVIEW + "variable_tab.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_OUT_OF_SYNCH, T_OVR + "error_co.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_MAY_BE_OUT_OF_SYNCH, T_OVR + "warning_co.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_SYNCHRONIZED, T_OVR + "sync_ovr.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_OUT_OF_SYNCH, T_OVR + "error_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_MAY_BE_OUT_OF_SYNCH, T_OVR + "warning_co.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_SYNCHRONIZED, T_OVR + "sync_ovr.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_MONITOR, T_OBJ + "monitor_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_OWNED, T_OVR + "owned_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_OWNS_MONITOR, T_OVR + "ownsmonitor_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_IN_CONTENTION, T_OVR + "contention_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_IN_CONTENTION_FOR_MONITOR, T_OVR + "contentionformonitor_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OVR_IN_DEADLOCK, T_OVR + "deadlock_ovr.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_CONTENDED_MONITOR, T_OBJ + "contended_monitor_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_OWNED_MONITOR, T_OBJ + "owned_monitor_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_THREAD_GROUP, T_OBJ + "threadgroup_obj.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_MONITOR, T_OBJ + "monitor_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_OWNED, T_OVR + "owned_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_OWNS_MONITOR, T_OVR + "ownsmonitor_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_IN_CONTENTION, T_OVR + "contention_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_IN_CONTENTION_FOR_MONITOR, T_OVR + "contentionformonitor_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OVR_IN_DEADLOCK, T_OVR + "deadlock_ovr.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_CONTENDED_MONITOR, T_OBJ + "contended_monitor_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_OWNED_MONITOR, T_OBJ + "owned_monitor_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_THREAD_GROUP, T_OBJ + "threadgroup_obj.png"); //$NON-NLS-1$
declareRegistryImage(IMG_WIZBAN_NEWSCRAPPAGE, T_WIZBAN + "newsbook_wiz.png"); //$NON-NLS-1$
declareRegistryImage(IMG_WIZBAN_LIBRARY, T_WIZBAN + "library_wiz.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_TOOL_TERMSNIPPET, T_ELCL + "term_sbook.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_TOOL_TERMSNIPPET_HOVER, T_ELCL + "term_sbook.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_TOOL_TERMSNIPPET_DISABLED, T_DLCL + "term_sbook.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_TOOL_TERMSNIPPET, T_ELCL + "term_sbook.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_TOOL_TERMSNIPPET_HOVER, T_ELCL + "term_sbook.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_TOOL_TERMSNIPPET_DISABLED, T_DLCL + "term_sbook.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJ_JAVA_INSPECT_EXPRESSION, T_OBJ + "insp_sbook.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_CLASSPATH, T_OBJ + "classpath_obj.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJ_JAVA_INSPECT_EXPRESSION, T_OBJ + "insp_sbook.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_CLASSPATH, T_OBJ + "classpath_obj.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_EXCEPTION_BRKPT_TYPE, T_OBJ + "jexcept_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_LINE_BRKPT_TYPE, T_OBJ + "jline_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_CLASSLOAD_BRKPT_TYPE, T_OBJ + "jload_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_METHOD_BRKPT_TYPE, T_OBJ + "jmeth_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_JSP_BRKPT_TYPE, T_OBJ + "jspbrkpt_obj.gif"); //$NON-NLS-1$
- declareRegistryImage(IMG_OBJS_WATCHPOINT_TYPE, T_OBJ + "jwatch_obj.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_EXCEPTION_BRKPT_TYPE, T_OBJ + "jexcept_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_LINE_BRKPT_TYPE, T_OBJ + "jline_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_CLASSLOAD_BRKPT_TYPE, T_OBJ + "jload_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_METHOD_BRKPT_TYPE, T_OBJ + "jmeth_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_JSP_BRKPT_TYPE, T_OBJ + "jspbrkpt_obj.png"); //$NON-NLS-1$
+ declareRegistryImage(IMG_OBJS_WATCHPOINT_TYPE, T_OBJ + "jwatch_obj.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_ELCL_AUTO_FORMAT, E_LCL + "autoform_menu.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_ELCL_AUTO_FORMAT, E_LCL + "autoform_menu.png"); //$NON-NLS-1$
- declareRegistryImage(IMG_ELCL_ALL_REFERENCES, E_LCL + "all_references.gif"); //$NON-NLS-1$
+ declareRegistryImage(IMG_ELCL_ALL_REFERENCES, E_LCL + "all_references.png"); //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
index 35713c7..6da14de 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,7 +29,6 @@
import org.eclipse.debug.ui.IDebugModelPresentation;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.debug.ui.IDebugView;
-import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.debug.core.IJavaDebugTarget;
import org.eclipse.jdt.debug.core.IJavaObject;
@@ -237,9 +236,8 @@
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
if (stackFrame.isSuspended()) {
- IJavaElement javaElement= getJavaElement(stackFrame);
- if (javaElement != null) {
- IJavaProject project = javaElement.getJavaProject();
+ IJavaProject project = getJavaProject(stackFrame);
+ if (project != null) {
IEvaluationEngine engine = null;
try {
Object selection= getSelectedObject();
@@ -292,19 +290,18 @@
}
}
- protected IJavaElement getJavaElement(IStackFrame stackFrame) {
+ protected IJavaProject getJavaProject(IStackFrame stackFrame) {
// Get the corresponding element.
ILaunch launch = stackFrame.getLaunch();
if (launch == null) {
return null;
}
- try {
- return JavaDebugUtils.resolveJavaElement(stackFrame, launch);
+ IJavaProject javaProject = null;
+ if (stackFrame instanceof IJavaStackFrame) {
+ javaProject = JavaDebugUtils.resolveJavaProject((IJavaStackFrame) stackFrame);
}
- catch (CoreException e) {
- return null;
- }
+ return javaProject;
}
/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
index 458b63e..1992198 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2015 IBM Corporation and others.
+ * Copyright (c) 2010, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,10 +33,10 @@
import org.eclipse.jdt.core.search.SearchRequestor;
import org.eclipse.jdt.core.search.TypeNameMatch;
import org.eclipse.jdt.core.search.TypeNameMatchRequestor;
+import org.eclipse.jdt.debug.ui.console.JavaStackTraceConsoleFactory;
import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
import org.eclipse.jdt.internal.debug.ui.console.JavaStackTraceConsole;
-import org.eclipse.jdt.internal.debug.ui.console.JavaStackTraceConsoleFactory;
import org.eclipse.jdt.ui.JavaElementLabelProvider;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.action.IAction;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java
index 5de4ab4..f490187 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsole.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -95,7 +95,7 @@
/**
* inits the document backing this console
*/
- void initializeDocument() {
+ public void initializeDocument() {
File file = new File(FILE_NAME);
if (file.exists()) {
try (InputStream fin = new BufferedInputStream(new FileInputStream(file))) {
@@ -134,7 +134,7 @@
/**
* Saves the backing document for this console
*/
- void saveDocument() {
+ public void saveDocument() {
try (FileOutputStream fout = new FileOutputStream(FILE_NAME)) {
IDocument document = getDocument();
if (document != null) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java
index ee24f88..32f197a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceConsoleFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,68 +10,13 @@
*******************************************************************************/
package org.eclipse.jdt.internal.debug.ui.console;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleFactory;
-import org.eclipse.ui.console.IConsoleListener;
-import org.eclipse.ui.console.IConsoleManager;
-
/**
- * Creates a new console into which users can paste stack traces and follow
- * the hyperlinks.
+ * Creates a new console into which users can paste stack traces and follow the hyperlinks.
*
+ * @deprecated use org.eclipse.jdt.debug.ui.console.JavaStackTraceConsoleFactory
* @since 3.1
*/
-public class JavaStackTraceConsoleFactory implements IConsoleFactory {
- private IConsoleManager fConsoleManager = null;
- private JavaStackTraceConsole fConsole = null;
+@Deprecated
+public class JavaStackTraceConsoleFactory extends org.eclipse.jdt.debug.ui.console.JavaStackTraceConsoleFactory {
- public JavaStackTraceConsoleFactory() {
- fConsoleManager = ConsolePlugin.getDefault().getConsoleManager();
- fConsoleManager.addConsoleListener(new IConsoleListener() {
- @Override
- public void consolesAdded(IConsole[] consoles) {
- }
-
- @Override
- public void consolesRemoved(IConsole[] consoles) {
- for (int i = 0; i < consoles.length; i++) {
- if(consoles[i] == fConsole) {
- fConsole.saveDocument();
- fConsole = null;
- }
- }
- }
-
- });
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.IConsoleFactory#openConsole()
- */
- @Override
- public void openConsole() {
- openConsole(null);
- }
-
- /**
- * Opens the console (creating a new one if not previously initialized).
- * If the passed string is not <code>null</code>, the text of the console
- * is set to the string.
- *
- * @param initialText text to put in the console or <code>null</code>.
- */
- public void openConsole(String initialText) {
- if (fConsole == null) {
- fConsole = new JavaStackTraceConsole();
- fConsole.initializeDocument();
- fConsoleManager.addConsoles(new IConsole[]{fConsole});
- }
- if (initialText != null){
- fConsole.getDocument().set(initialText);
- }
- fConsoleManager.showConsoleView(fConsole);
- }
-
-
}
diff --git a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
index 8776d96..80f4252 100644
--- a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug; singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.10.100.qualifier
Bundle-ClassPath: jdi.jar,
jdimodel.jar,
tools.jar
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java
index 76cd0b0..9076ffd 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/EvaluationSourceGenerator.java
@@ -178,6 +178,9 @@
token == ITerminalSymbols.TokenNameprivate || token == ITerminalSymbols.TokenNameprotected || token == ITerminalSymbols.TokenNamepublic)){
token = scanner.getNextToken();
}
+ else if (count == 0 && (token == ITerminalSymbols.TokenNamethrow)){
+ return false;
+ }
else if (count ==1 && (token == ITerminalSymbols.TokenNameLBRACE || token == ITerminalSymbols.TokenNameEQUAL)){
return true;
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java
index 9a6154f..0cd5809 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/JavaDebugUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2015 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -303,8 +303,14 @@
* @throws CoreException if an exception occurs
*/
public static IJavaElement resolveJavaElement(Object object, ILaunch launch) throws CoreException {
- Object sourceElement = resolveSourceElement(object, JAVA_STRATUM, launch);
- return getJavaElement(sourceElement);
+ Object sourceElement = resolveSourceElement(object, launch);
+ IJavaElement javaElement = getJavaElement(sourceElement);
+ if (javaElement == null) {
+ // fallback if default stratum does not provide a Java element
+ sourceElement = resolveSourceElement(object, JAVA_STRATUM, launch);
+ javaElement = getJavaElement(sourceElement);
+ }
+ return javaElement;
}
/**
@@ -403,8 +409,15 @@
ILaunch launch = frame.getLaunch();
if(launch != null) {
try {
- Object sourceElement = resolveSourceElement(frame, JAVA_STRATUM, launch);
+ Object sourceElement = resolveSourceElement(frame, launch);
IJavaElement element = getJavaElement(sourceElement);
+ if (element == null) {
+ Object sourceElement1 = resolveSourceElement(frame, JAVA_STRATUM, launch);
+ if (sourceElement1 != null){
+ sourceElement = sourceElement1;
+ element = getJavaElement(sourceElement);
+ }
+ }
if(element != null) {
return element.getJavaProject();
}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
index 3905f8c..31d1025 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -2671,49 +2671,6 @@
*
* @param method
* the {@link Method} location to check
- * @return <code>true</code> if the {@link Method} {@link Location}
- * should be filtered, <code>false</code> otherwise
- */
- protected boolean locationIsFiltered(Method method) {
- if (isStepFiltersEnabled()) {
- boolean filterStatics = getJavaDebugTarget()
- .isFilterStaticInitializers();
- boolean filterSynthetics = getJavaDebugTarget()
- .isFilterSynthetics();
- boolean filterConstructors = getJavaDebugTarget()
- .isFilterConstructors();
- boolean filterSetters = getJavaDebugTarget().isFilterSetters();
- boolean filterGetters = getJavaDebugTarget().isFilterGetters();
- IStepFilter[] contributedFilters = DebugPlugin.getStepFilters(JDIDebugPlugin.getUniqueIdentifier());
- if (!(filterStatics || filterSynthetics || filterConstructors
- || filterGetters || filterSetters || contributedFilters.length > 0)) {
- return false;
- }
-
- if ((filterStatics && method.isStaticInitializer())
- || (filterSynthetics && method.isSynthetic())
- || (filterConstructors && method.isConstructor())
- || (filterGetters && JDIMethod.isGetterMethod(method))
- || (filterSetters && JDIMethod.isSetterMethod(method))) {
- return true;
- }
- for (int i = 0; i < contributedFilters.length; i++) {
- if (contributedFilters[i].isFiltered(method)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Returns <code>true</code> if the StepEvent's Location is a Method
- * that the user has indicated (via the step filter preferences) should
- * be filtered. Returns <code>false</code> otherwise.
- *
- * @param method
- * the {@link Method} location to check
* @param orig
* <code>true</code> if the {@link Method} {@link Location} is the JDI Location
* from which an original user-requested step began, <code>false</code> otherwise
diff --git a/org.eclipse.jdt.debug/pom.xml b/org.eclipse.jdt.debug/pom.xml
index b861c82..0465a91 100644
--- a/org.eclipse.jdt.debug/pom.xml
+++ b/org.eclipse.jdt.debug/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2015 Eclipse Foundation and others.
+ Copyright (c) 2012, 2016 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>3.10.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.jdt.launching.macosx/pom.xml b/org.eclipse.jdt.launching.macosx/pom.xml
index 03d22ba..507c335 100644
--- a/org.eclipse.jdt.launching.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.macosx/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2015 Eclipse Foundation and others.
+ Copyright (c) 2012, 2016 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching.macosx</artifactId>
diff --git a/org.eclipse.jdt.launching.ui.macosx/pom.xml b/org.eclipse.jdt.launching.ui.macosx/pom.xml
index 9cd3040..25d7afc 100644
--- a/org.eclipse.jdt.launching.ui.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.ui.macosx/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2015 Eclipse Foundation and others.
+ Copyright (c) 2012, 2016 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching.ui.macosx</artifactId>
diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index a5869bc..894d528 100644
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.8.100.qualifier
+Bundle-Version: 3.8.200.qualifier
Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
index 6365f6e..bc8e121 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
@@ -67,6 +67,10 @@
* Launch configuration attribute key. The value is a name of
* a Java project associated with a Java launch configuration.
*/
+ /*
+ * This constant is referenced from an upper-layer bundle
+ * @see org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget#prepareBreakpointsSearchScope()
+ */
public static final String ATTR_PROJECT_NAME = LaunchingPlugin.getUniqueIdentifier() + ".PROJECT_ATTR"; //$NON-NLS-1$
/**
@@ -179,6 +183,10 @@
* unspecified, a classpath is computed by the classpath provider associated
* with a launch configuration.
*/
+ /*
+ * This constant is referenced from an upper-layer bundle
+ * @see org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget#prepareBreakpointsSearchScope()
+ */
public static final String ATTR_DEFAULT_CLASSPATH = LaunchingPlugin.getUniqueIdentifier() + ".DEFAULT_CLASSPATH"; //$NON-NLS-1$
/**
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index 85b0dee..a03e790 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching</artifactId>
- <version>3.8.100-SNAPSHOT</version>
+ <version>3.8.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/pom.xml b/pom.xml
index 914e16f..d94a3d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ Copyright (c) 2012, 2016 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -15,13 +15,13 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>eclipse.jdt.debug</groupId>
<artifactId>eclipse.jdt.debug</artifactId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
