From bf707f83e7c1bd9161afb4ec4fe0da44cd0a6e43 Mon Sep 17 00:00:00 2001
From: toshihiro <toshihiro>
Date: Fri, 13 Jul 2007 06:51:26 +0000
Subject: [PATCH] Fixed: 1736622 - "php marker occurrences" color - did`t have an effect

---
 .../internal/ui/text/JavaAnnotationHover.java      |    6 +++---
 .../ui/text/java/hover/AnnotationHover.java        |    5 +++--
 .../sourceforge/phpeclipse/PHPeclipsePlugin.java   |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaAnnotationHover.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaAnnotationHover.java
index f845fe3..0fe8fce 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaAnnotationHover.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaAnnotationHover.java
@@ -31,7 +31,6 @@ import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.ui.editors.text.EditorsUI;
 import org.eclipse.ui.texteditor.AnnotationPreference;
 
-// TODO: delete this class ? we use PHPAnnotationHover instead !
 /**
  * Determines all markers for the given line and collects, concatenates, and
  * formates their messages.
@@ -46,8 +45,9 @@ public class JavaAnnotationHover implements IAnnotationHover {
 
 	public static final JavaAnnotationHoverType VERTICAL_RULER_HOVER = new JavaAnnotationHoverType();
 
-	private IPreferenceStore fStore = PHPeclipsePlugin.getDefault()
-			.getPreferenceStore();
+	// private IPreferenceStore fStore =
+	// PHPeclipsePlugin.getDefault().getPreferenceStore();
+	private IPreferenceStore fStore = EditorsUI.getPreferenceStore();
 
 	private JavaAnnotationHoverType fType;
 
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AnnotationHover.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AnnotationHover.java
index 55579c3..5c54e32 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AnnotationHover.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AnnotationHover.java
@@ -37,8 +37,9 @@ import org.eclipse.ui.texteditor.IDocumentProvider;
 
 public class AnnotationHover extends AbstractJavaEditorTextHover {
 
-	private IPreferenceStore fStore = PHPeclipsePlugin.getDefault()
-			.getPreferenceStore();
+	// private IPreferenceStore fStore =
+	// PHPeclipsePlugin.getDefault().getPreferenceStore();
+	private IPreferenceStore fStore = EditorsUI.getPreferenceStore();
 
 	private DefaultMarkerAnnotationAccess fAnnotationAccess = new DefaultMarkerAnnotationAccess();
 
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 97c36bc..b17fb81 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -830,7 +830,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
 		JavaCore.initializeDefaultPluginPreferences();
 		PreferenceConstants.initializeDefaultValues(store);
 		// externalTools.initializeDefaultPreferences(store);
-		MarkerAnnotationPreferences.initializeDefaultValues(store);
+		// MarkerAnnotationPreferences.initializeDefaultValues(store);
 	}
 
 	private IWorkbenchPage internalGetActivePage() {
-- 
1.7.1