Further fixes for bug 360085.

	Bug #360085
	
	* plugin.xml: Add new annotation icons for Valgrind markers.
	* icons/valgrind-error.gif: New file.
	* icons/valgrind-warning.gif: New file.
	* icons/valgrind-info.gif: New file.
	* plugin.properties: Add new labels for new additions to plugin.xml.

5 files changed, 48 insertions, 1 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-error.gif b/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-error.gif
new file mode 100644
index 0000000000..bcbbcd3268
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-error.gif
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-info.gif b/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-info.gif
new file mode 100644
index 0000000000..b4a4b1fa08
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-info.gif
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-warning.gif b/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-warning.gif
new file mode 100644
index 0000000000..fc0981943b
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/icons/valgrind-warning.gif
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties
index 2fff3b4729..e4c2c34ca9 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties
@@ -2,4 +2,7 @@
 view.name.0 = Valgrind
 Bundle-Vendor.0 = Eclipse Linux Tools
 Bundle-Name.0 = Valgrind UI Plug-in (Incubation)
-extension-point.name.0 = valgrindToolViews
\ No newline at end of file
+extension-point.name.0 = valgrindToolViews
+marker.editor.error = Valgrind Errors
+marker.editor.warning = Valgrind Warnings
+marker.editor.info = Valgrind Info
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.xml
index aed9df057c..1fe08feb5c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.xml
@@ -31,5 +31,49 @@
          </separator>
       </menuContribution>
    </extension>
+    <extension
+          point="org.eclipse.ui.editors.annotationTypes">
+       <type
+             markerSeverity="2"
+             markerType="org.eclipse.linuxtools.valgrind.launch.marker"
+             name="org.eclipse.linuxtools.valgrind.annotation.error"
+             super="org.eclipse.ui.workbench.texteditor.error">
+       </type>
+       <type
+             markerSeverity="1"
+             markerType="org.eclipse.linuxtools.valgrind.launch.marker"
+             name="org.eclipse.linuxtools.valgrind.annotation.warning"
+             super="org.eclipse.ui.workbench.texteditor.warning">
+       </type>
+       <type
+             markerSeverity="0"
+             markerType="org.eclipse.linuxtools.valgrind.launch.marker"
+             name="org.eclipse.linuxtools.valgrind.annotation.info"
+             super="org.eclipse.ui.workbench.texteditor.info">
+       </type>
+    </extension>
+      <extension
+         point="org.eclipse.ui.editors.markerAnnotationSpecification">
+      <specification
+      		annotationType="org.eclipse.linuxtools.valgrind.annotation.error"
+            label="%marker.editor.error"
+            icon="icons/valgrind-error.gif"
+            quickFixIcon="icons/valgrind_error.gif"
+            presentationLayer="6">
+      </specification>
+            <specification
+      		annotationType="org.eclipse.linuxtools.valgrind.annotation.warning"
+            label="%marker.editor.warning"
+            icon="icons/valgrind-warning.gif"
+            quickFixIcon="icons/valgrind_warning.gif"
+            presentationLayer="5">
+      </specification>
+            <specification
+      		annotationType="org.eclipse.linuxtools.valgrind.annotation.info"
+            label="%marker.editor.info"
+            icon="icons/valgrind-info.gif"
+            presentationLayer="4">
+      </specification>
+         </extension>
 
 </plugin>