X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
index c702b12..99e8fa1 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
@@ -131,7 +131,7 @@ public class JavaEditorPreferencePage extends PreferencePage
           PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR},
       //$NON-NLS-1$
       {PreferencesMessages.getString("PHPEditorPreferencePage.tags"),
-          PreferenceConstants.EDITOR_JAVA_TAG_COLOR},
+          PreferenceConstants.EDITOR_PHP_TAG_COLOR},  
       //$NON-NLS-1$
       {PreferencesMessages.getString("PHPEditorPreferencePage.keywords"),
           PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR},
@@ -151,8 +151,13 @@ public class JavaEditorPreferencePage extends PreferencePage
           PreferenceConstants.EDITOR_STRING_COLOR},
       //$NON-NLS-1$
       {PreferencesMessages.getString("PHPEditorPreferencePage.others"),
-          PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR},
+          PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR}, //$NON-NLS-1$
+      { PreferencesMessages.getString("JavaEditorPreferencePage.operators"),
+        PreferenceConstants.EDITOR_PHP_OPERATOR_COLOR },  
       //$NON-NLS-1$
+        { PreferencesMessages.getString("JavaEditorPreferencePage.returnKeyword"),
+          PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_COLOR },  
+        //$NON-NLS-1$
       {PreferencesMessages.getString("PHPEditorPreferencePage.phpDocKeywords"),
           PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR},
       //$NON-NLS-1$
@@ -364,12 +369,42 @@ public class JavaEditorPreferencePage extends PreferencePage
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
         OverlayPreferenceStore.BOOLEAN,
         PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD));
-    overlayKeys
-        .add(new OverlayPreferenceStore.OverlayKey(
+        
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.STRING,
+        PreferenceConstants.EDITOR_PHP_TAG_COLOR));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.BOOLEAN,
+        PreferenceConstants.EDITOR_PHP_TAG_BOLD));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.STRING,
+        PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_COLOR));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.BOOLEAN,
+        PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_BOLD));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.STRING,
+        PreferenceConstants.EDITOR_PHP_VARIABLE_COLOR));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.BOOLEAN,
+        PreferenceConstants.EDITOR_PHP_VARIABLE_BOLD));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.STRING,
+        PreferenceConstants.EDITOR_PHP_CONSTANT_COLOR));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.BOOLEAN,
+        PreferenceConstants.EDITOR_PHP_CONSTANT_BOLD));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.STRING,
+        PreferenceConstants.EDITOR_PHP_TYPE_COLOR));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+        OverlayPreferenceStore.BOOLEAN,
+        PreferenceConstants.EDITOR_PHP_TYPE_BOLD));
+    
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
             OverlayPreferenceStore.STRING,
             PreferenceConstants.EDITOR_STRING_COLOR));
-    overlayKeys
-        .add(new OverlayPreferenceStore.OverlayKey(
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
             OverlayPreferenceStore.BOOLEAN,
             PreferenceConstants.EDITOR_STRING_BOLD));
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
@@ -390,12 +425,18 @@ public class JavaEditorPreferencePage extends PreferencePage
     //		overlayKeys.add(new
     // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
     // PreferenceConstants.EDITOR_JAVA_METHOD_NAME_BOLD));
-    //		overlayKeys.add(new
-    // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,
-    // PreferenceConstants.EDITOR_JAVA_OPERATOR_COLOR));
-    //		overlayKeys.add(new
-    // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
-    // PreferenceConstants.EDITOR_JAVA_OPERATOR_BOLD));
+    overlayKeys.add(new
+       OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,
+       PreferenceConstants.EDITOR_PHP_OPERATOR_COLOR));
+    overlayKeys.add(new
+       OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+       PreferenceConstants.EDITOR_PHP_OPERATOR_BOLD));
+    overlayKeys.add(new
+        OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,
+        PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_COLOR));
+     overlayKeys.add(new
+        OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+        PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_BOLD));
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
         OverlayPreferenceStore.STRING,
         PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR));
@@ -1594,13 +1635,11 @@ public class JavaEditorPreferencePage extends PreferencePage
     		item= new TabItem(folder, SWT.NONE);
     		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.hoverTab.title"));
      //$NON-NLS-1$
-    		fJavaEditorHoverConfigurationBlock= new
-     JavaEditorHoverConfigurationBlock(this, fOverlayStore);
+    		fJavaEditorHoverConfigurationBlock= new JavaEditorHoverConfigurationBlock(this, fOverlayStore);
     		item.setControl(fJavaEditorHoverConfigurationBlock.createControl(folder));
-    		item= new TabItem(folder, SWT.NONE);
-    		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.navigationTab.title"));
-     //$NON-NLS-1$
-    		item.setControl(createNavigationPage(folder));
+//    		item= new TabItem(folder, SWT.NONE);
+//    		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.navigationTab.title"));  //$NON-NLS-1$
+//    		item.setControl(createNavigationPage(folder));
     		item= new TabItem(folder, SWT.NONE);
     		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.folding.title")); //$NON-NLS-1$
     		item.setControl(fFoldingConfigurationBlock.createControl(folder));