From 54e17334d2254ceac1ff16c8f47b0199cff98c7a Mon Sep 17 00:00:00 2001
From: Sjors Hettinga <s.a.hettinga@gmail.com>
Date: Sun, 5 Oct 2014 14:15:13 +0200
Subject: [PATCH] Fix Occurences marking

---
 src/icons/searchm_obj.gif                     | Bin 0 -> 200 bytes
 src/plugin.xml                                |  21 ++----------------
 .../editor/MarkSelectionOccurences.java       |   2 +-
 3 files changed, 3 insertions(+), 20 deletions(-)
 create mode 100644 src/icons/searchm_obj.gif

diff --git a/src/icons/searchm_obj.gif b/src/icons/searchm_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7b1efa5498f4c52d01a5f7aa538a5d69dd18c484
GIT binary patch
literal 200
zcmZ?wbhEHb6krfwIKsg2@9+D6zn=YhyYt_-o4+6Q{CTnB&*PaJ%lOup@-0Z?UY5<X
zwupCr64&emuKB6l|G|KP6rlK%g^>Yhl@3S~$W8`UR|S>6l+1Z6eyq{_DRaDeoe7h|
zrk^@C@+{qRvK@4UnwPdGoJ`Sbnc$x2HP>pv#g?#a1C<Sdx0)Rj8YcH1vpku#^L{}H
H2ZJ>LdMiZc

literal 0
HcmV?d00001

diff --git a/src/plugin.xml b/src/plugin.xml
index 656e837..7dd8839 100644
--- a/src/plugin.xml
+++ b/src/plugin.xml
@@ -473,8 +473,8 @@
          point="org.eclipse.ui.editors.markerAnnotationSpecification">
       <specification
             annotationType="net.sourceforge.veditor.occurrences"
-            label="%OccurrenceAnnotation.label"
-            icon="$nl$/icons/full/obj16/searchm_obj.gif"
+            label="Occurrence (Veditor)"
+            icon="$nl$/icons/searchm_obj.gif"
             textPreferenceKey="occurrenceIndication"
             textPreferenceValue="false"
             highlightPreferenceKey="occurrenceHighlighting"
@@ -496,23 +496,6 @@
             textStylePreferenceKey="occurrenceTextStyle"
             textStylePreferenceValue="NONE">
       </specification>
-      <specification
-            annotationType="net.sourceforge.veditor.occurrences.write"
-            label="%WriteOccurrenceAnnotation.label"
-            textPreferenceKey="writeOccurrenceIndication"
-            textPreferenceValue="false"
-            highlightPreferenceKey="writeOccurrenceHighlighting"
-            highlightPreferenceValue="true"
-            overviewRulerPreferenceKey="writeOccurrenceIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            verticalRulerPreferenceKey="writeOccurrenceIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="false"
-            colorPreferenceKey="writeOccurrenceIndicationColor"
-            colorPreferenceValue="240,216,168"
-            presentationLayer="4"
-            textStylePreferenceKey="writeOccurrenceTextStyle"
-            textStylePreferenceValue="NONE">
-      </specification>
    </extension>
 
 </plugin>
diff --git a/src/src/net/sourceforge/veditor/editor/MarkSelectionOccurences.java b/src/src/net/sourceforge/veditor/editor/MarkSelectionOccurences.java
index 1c6e444..c35d699 100644
--- a/src/src/net/sourceforge/veditor/editor/MarkSelectionOccurences.java
+++ b/src/src/net/sourceforge/veditor/editor/MarkSelectionOccurences.java
@@ -73,7 +73,7 @@ public void selectionChanged(SelectionChangedEvent event) {
 				// for single finds do not highlight
 				if ((findList.size() > 1) && (findList.size() < maxHits)) {
 					for (int i=0;i < findList.size(); i++) {
-						Annotation annotation = new Annotation( "org.eclipse.jdt.ui.occurrences", false, "Description" );
+						Annotation annotation = new Annotation( "net.sourceforge.veditor.occurrences", false, "Description" );
 						model.addAnnotation( annotation, new Position( findList.get(i), textSelection.getLength() ) );
 						annotationArray.add(annotation);
 					}