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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
index f978141..0afea31 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
@@ -24,7 +24,7 @@ import org.eclipse.ui.texteditor.WorkbenchChainedTextFontFieldEditor;
 
 //import org.phpeclipse.phpdt.core.IClasspathEntry;
 //
-//import org.phpeclipse.phpdt.ui.text.IJavaColorConstants;
+import net.sourceforge.phpdt.ui.text.IJavaColorConstants;
 //
 //import org.phpeclipse.phpdt.internal.ui.JavaPlugin;
 //import org.phpeclipse.phpdt.internal.ui.preferences.NewJavaProjectPreferencePage;
@@ -883,187 +883,271 @@ public class PreferenceConstants {
 	 */
 	public static final String EDITOR_BOLD_SUFFIX= "_bold"; //$NON-NLS-1$
 
-//	/**
-//	 * A named preference that holds the color used to render multi line comments.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_MULTI_LINE_COMMENT_COLOR= IJavaColorConstants.JAVA_MULTI_LINE_COMMENT;
-//
-//	/**
-//	 * A named preference that controls whether multi line comments are rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>. If <code>true</code> multi line comments are rendered
-//	 * in bold. If <code>false</code> the are rendered using no font style attribute.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_MULTI_LINE_COMMENT_BOLD= IJavaColorConstants.JAVA_MULTI_LINE_COMMENT + EDITOR_BOLD_SUFFIX; 
-//
-//	/**
-//	 * A named preference that holds the color used to render single line comments.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_SINGLE_LINE_COMMENT_COLOR= IJavaColorConstants.JAVA_SINGLE_LINE_COMMENT;
-//
-//	/**
-//	 * A named preference that controls whether sinle line comments are rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>. If <code>true</code> single line comments are rendered
-//	 * in bold. If <code>false</code> the are rendered using no font style attribute.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_SINGLE_LINE_COMMENT_BOLD= IJavaColorConstants.JAVA_SINGLE_LINE_COMMENT + EDITOR_BOLD_SUFFIX; 
-//
-//	/**
-//	 * A named preference that holds the color used to render php keywords.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_JAVA_KEYWORD_COLOR= IJavaColorConstants.JAVA_KEYWORD;
-//
-//	/**
-//	 * A named preference that controls whether keywords are rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_JAVA_KEYWORD_BOLD= IJavaColorConstants.JAVA_KEYWORD + EDITOR_BOLD_SUFFIX;
-//
-//	/**
-//	 * A named preference that holds the color used to render string constants.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_STRING_COLOR= IJavaColorConstants.JAVA_STRING;
-//
-//	/**
-//	 * A named preference that controls whether string constants are rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_STRING_BOLD= IJavaColorConstants.JAVA_STRING + EDITOR_BOLD_SUFFIX;
-//
-//	/**
-//	 * A named preference that holds the color used to render php default text.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_JAVA_DEFAULT_COLOR= IJavaColorConstants.JAVA_DEFAULT;
-//
-//	/**
-//	 * A named preference that controls whether Java default text is rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_JAVA_DEFAULT_BOLD= IJavaColorConstants.JAVA_DEFAULT + EDITOR_BOLD_SUFFIX;
-//
-//	/**
-//	 * A named preference that holds the color used to render phpdoc keywords.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_JAVADOC_KEYWORD_COLOR= IJavaColorConstants.JAVADOC_KEYWORD;
-//
-//	/**
-//	 * A named preference that controls whether phpdoc keywords are rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_JAVADOC_KEYWORD_BOLD= IJavaColorConstants.JAVADOC_KEYWORD + EDITOR_BOLD_SUFFIX;
-//
-//	/**
-//	 * A named preference that holds the color used to render phpdoc tags.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_JAVADOC_TAG_COLOR= IJavaColorConstants.JAVADOC_TAG;
-//
-//	/**
-//	 * A named preference that controls whether phpdoc tags are rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_JAVADOC_TAG_BOLD= IJavaColorConstants.JAVADOC_TAG + EDITOR_BOLD_SUFFIX;
-//
-//	/**
-//	 * A named preference that holds the color used to render phpdoc links.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_JAVADOC_LINKS_COLOR= IJavaColorConstants.JAVADOC_LINK;
-//
-//	/**
-//	 * A named preference that controls whether phpdoc links are rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_JAVADOC_LINKS_BOLD= IJavaColorConstants.JAVADOC_LINK + EDITOR_BOLD_SUFFIX;
-//		
-//	/**
-//	 * A named preference that holds the color used to render phpdoc default text.
-//	 * <p>
-//	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-//	 * using class <code>PreferenceConverter</code>
-//	 * </p>
-//	 * 
-//	 * @see org.eclipse.jface.resource.StringConverter
-//	 * @see org.eclipse.jface.preference.PreferenceConverter
-//	 */
-//	public final static String EDITOR_JAVADOC_DEFAULT_COLOR= IJavaColorConstants.JAVADOC_DEFAULT;
-//
-//	/**
-//	 * A named preference that controls whether phpdoc default text is rendered in bold.
-//	 * <p>
-//	 * Value is of type <code>Boolean</code>.
-//	 * </p>
-//	 */
-//	public final static String EDITOR_JAVADOC_DEFAULT_BOLD= IJavaColorConstants.JAVADOC_DEFAULT + EDITOR_BOLD_SUFFIX;
+	/**
+	 * A named preference that holds the color used to render multi line comments.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_MULTI_LINE_COMMENT_COLOR= IJavaColorConstants.PHP_MULTI_LINE_COMMENT;
+
+	/**
+	 * A named preference that controls whether multi line comments are rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>. If <code>true</code> multi line comments are rendered
+	 * in bold. If <code>false</code> the are rendered using no font style attribute.
+	 * </p>
+	 */
+	public final static String EDITOR_MULTI_LINE_COMMENT_BOLD= IJavaColorConstants.PHP_MULTI_LINE_COMMENT + EDITOR_BOLD_SUFFIX; 
+
+	/**
+	 * A named preference that holds the color used to render single line comments.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_SINGLE_LINE_COMMENT_COLOR= IJavaColorConstants.PHP_SINGLE_LINE_COMMENT;
+
+	/**
+	 * A named preference that controls whether sinle line comments are rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>. If <code>true</code> single line comments are rendered
+	 * in bold. If <code>false</code> the are rendered using no font style attribute.
+	 * </p>
+	 */
+	public final static String EDITOR_SINGLE_LINE_COMMENT_BOLD= IJavaColorConstants.PHP_SINGLE_LINE_COMMENT + EDITOR_BOLD_SUFFIX; 
+
+	/**
+	 * A named preference that holds the color used to render php keywords.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_JAVA_KEYWORD_COLOR= IJavaColorConstants.PHP_KEYWORD;
+
+	/**
+	 * A named preference that controls whether keywords are rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 */
+	public final static String EDITOR_JAVA_KEYWORD_BOLD= IJavaColorConstants.PHP_KEYWORD + EDITOR_BOLD_SUFFIX;
+
+  /**
+   * A named preference that holds the color used to render predefined php
+   * function names.
+   * <p>
+   * Value is of type <code>String</code>. A RGB color value encoded as a string
+   * using class <code>PreferenceConverter</code>
+   * </p>
+   * 
+   * @see org.eclipse.jface.resource.StringConverter
+   * @see org.eclipse.jface.preference.PreferenceConverter
+   */
+  public final static String EDITOR_PHP_FUNCTIONNAME_COLOR= IJavaColorConstants.PHP_FUNCTIONNAME;
+
+  /**
+   * A named preference that controls whether function names are rendered in
+   * bold.
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   */
+  public final static String EDITOR_PHP_FUNCTIONNAME_BOLD= IJavaColorConstants.PHP_FUNCTIONNAME + EDITOR_BOLD_SUFFIX;
+
+  /**
+   * A named preference that holds the color used to render php
+   * variables.
+   * <p>
+   * Value is of type <code>String</code>. A RGB color value encoded as a string
+   * using class <code>PreferenceConverter</code>
+   * </p>
+   * 
+   * @see org.eclipse.jface.resource.StringConverter
+   * @see org.eclipse.jface.preference.PreferenceConverter
+   */
+  public final static String EDITOR_PHP_VARIABLE_COLOR= IJavaColorConstants.PHP_VARIABLE;
+
+  /**
+   * A named preference that controls whether variables are rendered in bold.
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   */
+  public final static String EDITOR_PHP_VARIABLE_BOLD= IJavaColorConstants.PHP_VARIABLE + EDITOR_BOLD_SUFFIX;
+
+  /**
+   * A named preference that holds the color used to render php constants.
+   * <p>
+   * Value is of type <code>String</code>. A RGB color value encoded as a string
+   * using class <code>PreferenceConverter</code>
+   * </p>
+   * 
+   * @see org.eclipse.jface.resource.StringConverter
+   * @see org.eclipse.jface.preference.PreferenceConverter
+   */
+  public final static String EDITOR_PHP_CONSTANT_COLOR= IJavaColorConstants.PHP_CONSTANT;
+
+  /**
+   * A named preference that controls whether constants are rendered in bold.
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   */
+  public final static String EDITOR_PHP_CONSTANT_BOLD= IJavaColorConstants.PHP_CONSTANT + EDITOR_BOLD_SUFFIX;
+
+  /**
+   * A named preference that holds the color used to render php types.
+   * <p>
+   * Value is of type <code>String</code>. A RGB color value encoded as a string
+   * using class <code>PreferenceConverter</code>
+   * </p>
+   * 
+   * @see org.eclipse.jface.resource.StringConverter
+   * @see org.eclipse.jface.preference.PreferenceConverter
+   */
+  public final static String EDITOR_PHP_TYPE_COLOR= IJavaColorConstants.PHP_TYPE;
+
+  /**
+   * A named preference that controls whether types are rendered in bold.
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   */
+  public final static String EDITOR_PHP_TYPE_BOLD= IJavaColorConstants.PHP_TYPE + EDITOR_BOLD_SUFFIX;
+
+
+	/**
+	 * A named preference that holds the color used to render string constants.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_STRING_COLOR= IJavaColorConstants.PHP_STRING;
+
+	/**
+	 * A named preference that controls whether string constants are rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 */
+	public final static String EDITOR_STRING_BOLD= IJavaColorConstants.PHP_STRING + EDITOR_BOLD_SUFFIX;
+
+	/**
+	 * A named preference that holds the color used to render php default text.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_JAVA_DEFAULT_COLOR= IJavaColorConstants.PHP_DEFAULT;
+
+	/**
+	 * A named preference that controls whether Java default text is rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 */
+	public final static String EDITOR_JAVA_DEFAULT_BOLD= IJavaColorConstants.PHP_DEFAULT + EDITOR_BOLD_SUFFIX;
+
+	/**
+	 * A named preference that holds the color used to render phpdoc keywords.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_JAVADOC_KEYWORD_COLOR= IJavaColorConstants.PHPDOC_KEYWORD;
+
+	/**
+	 * A named preference that controls whether phpdoc keywords are rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 */
+	public final static String EDITOR_JAVADOC_KEYWORD_BOLD= IJavaColorConstants.PHPDOC_KEYWORD + EDITOR_BOLD_SUFFIX;
+
+	/**
+	 * A named preference that holds the color used to render phpdoc tags.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_JAVADOC_TAG_COLOR= IJavaColorConstants.PHPDOC_TAG;
+
+	/**
+	 * A named preference that controls whether phpdoc tags are rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 */
+	public final static String EDITOR_JAVADOC_TAG_BOLD= IJavaColorConstants.PHPDOC_TAG + EDITOR_BOLD_SUFFIX;
+
+	/**
+	 * A named preference that holds the color used to render phpdoc links.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_JAVADOC_LINKS_COLOR= IJavaColorConstants.PHPDOC_LINK;
+
+	/**
+	 * A named preference that controls whether phpdoc links are rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 */
+	public final static String EDITOR_JAVADOC_LINKS_BOLD= IJavaColorConstants.PHPDOC_LINK + EDITOR_BOLD_SUFFIX;
+		
+	/**
+	 * A named preference that holds the color used to render phpdoc default text.
+	 * <p>
+	 * Value is of type <code>String</code>. A RGB color value encoded as a string
+	 * using class <code>PreferenceConverter</code>
+	 * </p>
+	 * 
+	 * @see org.eclipse.jface.resource.StringConverter
+	 * @see org.eclipse.jface.preference.PreferenceConverter
+	 */
+	public final static String EDITOR_JAVADOC_DEFAULT_COLOR= IJavaColorConstants.PHPDOC_DEFAULT;
+
+	/**
+	 * A named preference that controls whether phpdoc default text is rendered in bold.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 */
+	public final static String EDITOR_JAVADOC_DEFAULT_BOLD= IJavaColorConstants.PHPDOC_DEFAULT + EDITOR_BOLD_SUFFIX;
 
 	/**
 	 * A named preference that holds the color used for 'linked-mode' underline.
@@ -1635,32 +1719,44 @@ public class PreferenceConstants {
 		store.setDefault(PreferenceConstants.EDITOR_TAB_WIDTH, 4);
 		store.setDefault(PreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
 
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
-//		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD, false);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
-//		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, false);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, new RGB(127, 0, 85));
-//		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_STRING_COLOR, new RGB(42, 0, 255));
-//		store.setDefault(PreferenceConstants.EDITOR_STRING_BOLD, false);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, new RGB(0, 0, 0));
-//		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD, false);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, new RGB(127, 159, 191));
-//		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD, true);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, new RGB(127, 127, 159));
-//		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD, false);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, new RGB(63, 63, 191));
-//		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD, false);
-//
-//		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, new RGB(63, 95, 191));
-//		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD, false);
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
+		store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD, false);
+
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
+		store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, false);
+
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, new RGB(127, 0, 85));
+		store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true);
+
+    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_COLOR, new RGB(127, 127, 159));
+    store.setDefault(PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_BOLD, false);
+
+    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PHP_VARIABLE_COLOR, new RGB(127, 159, 191));
+    store.setDefault(PreferenceConstants.EDITOR_PHP_VARIABLE_BOLD, false);
+    
+    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PHP_CONSTANT_COLOR, new RGB(127, 0, 85));
+    store.setDefault(PreferenceConstants.EDITOR_PHP_CONSTANT_BOLD, false);
+
+    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PHP_TYPE_COLOR, new RGB(127, 0, 85));
+    store.setDefault(PreferenceConstants.EDITOR_PHP_TYPE_BOLD, false);
+        
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_STRING_COLOR, new RGB(42, 0, 255));
+		store.setDefault(PreferenceConstants.EDITOR_STRING_BOLD, false);
+
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, new RGB(0, 0, 0));
+		store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD, false);
+
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, new RGB(127, 159, 191));
+		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD, true);
+
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, new RGB(127, 127, 159));
+		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD, false);
+
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, new RGB(63, 63, 191));
+		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD, false);
+
+		PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, new RGB(63, 95, 191));
+		store.setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD, false);
 
 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION, true);
 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 500);
@@ -1672,7 +1768,7 @@ public class PreferenceConstants {
 		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND, new RGB(0, 0, 0));
 		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND, new RGB(255, 255, 0));
 		PreferenceConverter.setDefault(store, PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND, new RGB(255, 0, 0));
-		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, "."); //$NON-NLS-1$
+		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, "$"); //$NON-NLS-1$
 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC, "@"); //$NON-NLS-1$
 		store.setDefault(PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS, true);
 		store.setDefault(PreferenceConstants.CODEASSIST_CASE_SENSITIVITY, false);