removed NPE in XMLPreferenceInitializer

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / IPreferenceConstants.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
index f6b7cef..f0f5946 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
@@ -18,14 +18,14 @@ package net.sourceforge.phpeclipse;
 public interface IPreferenceConstants {
   /**
    * Preference key suffix for bold text style preference keys.
-   * 
+   *
    * @since 2.1
    */
   public static final String EDITOR_BOLD_SUFFIX = "_bold"; //$NON-NLS-1$
 
   /**
    * Preference key suffix for italic text style preference keys.
-   * 
+   *
    * @since 3.0
    */
   public static final String EDITOR_ITALIC_SUFFIX = "_italic"; //$NON-NLS-1$
@@ -55,19 +55,19 @@ public interface IPreferenceConstants {
 //  public static final String APACHE_RESTART_BACKGROUND = "_apache_restart_background";
 //
 //  public static final String APACHE_RESTART_PREF = "__apache_restart";
-  
+
 //  public static final String HTTPD_CONF_PATH_PREF = "__httpd_conf_path";
-//  
+//
 //  public static final String ETC_HOSTS_PATH_PREF = "__etc_hosts_path";
 
-  public static final String SHOW_OUTPUT_IN_CONSOLE = "_show_output_in_console";
+//  public static final String SHOW_OUTPUT_IN_CONSOLE = "_show_output_in_console";
 
 //  public static final String PHP_RUN_PREF = "_php_run_pref";
 //
 //  public static final String EXTERNAL_PARSER_PREF = "_external_parser";
 
-  public static final String PHP_EXTENSION_PREFS = "_php_parser_extensions";
-  
+//  public static final String PHP_EXTENSION_PREFS = "_php_parser_extensions";
+
 //  public static final String PHP_PARSER_DEFAULT = "_php_parser_default";
 
   //  public static final String PHP_INTERNAL_PARSER = "_php_internal_parser";
@@ -83,14 +83,14 @@ public interface IPreferenceConstants {
 
   /**
    * The color key for operators and brackets in PHP code (value <code>"__php_operator"</code>).
-   * 
+   *
    * @since 3.0
    */
   public static final String PHP_OPERATOR = "__php_operator"; //$NON-NLS-1$
 
   /**
    * The color key for {} in PHP code (value <code>"__php_brace_operator"</code>).
-   * 
+   *
    * @since 3.0
    */
   public static final String PHP_BRACE_OPERATOR = "__php_brace_operator"; //$NON-NLS-1$
@@ -100,7 +100,7 @@ public interface IPreferenceConstants {
    * <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
    * @since 3.0
@@ -112,7 +112,7 @@ public interface IPreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * 
+   *
    * @since 3.0
    */
   public final static String EDITOR_PHP_OPERATOR_BOLD = PHP_OPERATOR + EDITOR_BOLD_SUFFIX;
@@ -122,7 +122,7 @@ public interface IPreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * 
+   *
    * @since 3.0
    */
   public final static String EDITOR_PHP_OPERATOR_ITALIC = PHP_OPERATOR + EDITOR_ITALIC_SUFFIX;
@@ -132,7 +132,7 @@ public interface IPreferenceConstants {
    * <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
    * @since 3.0
@@ -144,7 +144,7 @@ public interface IPreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * 
+   *
    * @since 3.0
    */
   public final static String EDITOR_PHP_BRACE_OPERATOR_BOLD = PHP_BRACE_OPERATOR + EDITOR_BOLD_SUFFIX;
@@ -154,14 +154,14 @@ public interface IPreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * 
+   *
    * @since 3.0
    */
   public final static String EDITOR_PHP_BRACE_OPERATOR_ITALIC = PHP_BRACE_OPERATOR + EDITOR_ITALIC_SUFFIX;
 
   /**
    * The color key for keyword 'return' in PHP code (value <code>"__php_keyword_return"</code>).
-   * 
+   *
    * @since 3.0
    */
   public static final String PHP_KEYWORD_RETURN = "__php_keyword_return"; //$NON-NLS-1$
@@ -171,7 +171,7 @@ public interface IPreferenceConstants {
    * <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
    * @since 3.0
@@ -183,7 +183,7 @@ public interface IPreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * 
+   *
    * @since 3.0
    */
   public final static String EDITOR_PHP_KEYWORD_RETURN_BOLD = PHP_KEYWORD_RETURN + EDITOR_BOLD_SUFFIX;
@@ -193,7 +193,7 @@ public interface IPreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * 
+   *
    * @since 3.0
    */
   public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = PHP_KEYWORD_RETURN + EDITOR_ITALIC_SUFFIX;
@@ -230,6 +230,14 @@ public interface IPreferenceConstants {
 
   public static final String PHP_VARIABLE_UNDERLINE = "_php_variable_underline";//$NON-NLS-1$
 
+  public static final String PHP_VARIABLE_DOLLAR = "_php_variable_dollar";//$NON-NLS-1$
+
+  public static final String PHP_VARIABLE_DOLLAR_BOLD = "_php_variable_dollar_bold";//$NON-NLS-1$
+
+  public static final String PHP_VARIABLE_DOLLAR_ITALIC = "_php_variable_dollar_italic";//$NON-NLS-1$
+
+  public static final String PHP_VARIABLE_DOLLAR_UNDERLINE = "_php_variable_dollar_underline";//$NON-NLS-1$
+
   public static final String PHP_TYPE = "_php_type";//$NON-NLS-1$
 
   public static final String PHP_TYPE_BOLD = "_php_type_bold";//$NON-NLS-1$
@@ -269,7 +277,7 @@ public interface IPreferenceConstants {
   public static final String PHP_STRING_ITALIC_SQ = "_php_string_sq_italic";
 
   public static final String PHP_STRING_UNDERLINE_SQ = "_php_string_sq_underline";
-  
+
   public static final String PHP_DEFAULT = "_php_default";
 
   public static final String PHP_DEFAULT_BOLD = "_php_default_bold";
@@ -340,11 +348,11 @@ public interface IPreferenceConstants {
 
   public static final String EDITOR_CORRECTION_INDICATION = null;
 
-  public static final String PHP_OBFUSCATOR_DEFAULT = "_php_obfuscator_default";
+//  public static final String PHP_OBFUSCATOR_DEFAULT = "_php_obfuscator_default";
   //  public static final String PHP_BOOKMARK_DEFAULT = "_php_bookmark_default";
   //  public static final String PHP_LOCALHOST_PREF = "_php_localhost";
   //  public static final String PHP_DOCUMENTROOT_PREF = "_php_documentroot";
-  //  
+  //
   //  public static final String PHP_AUTO_PREVIEW_DEFAULT = "_auto_preview";
   //  public static final String PHP_BRING_TO_TOP_PREVIEW_DEFAULT = "_bring_to_top_preview";
   //  public static final String PHP_SHOW_HTML_FILES_LOCAL = "_show_html_files_local";