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 1b6474c..75c3a01 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
@@ -10,19 +10,18 @@
******************************************************************************/
package net.sourceforge.phpdt.ui;
+import net.sourceforge.phpdt.core.IClasspathEntry;
import net.sourceforge.phpeclipse.IPreferenceConstants;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.texteditor.AbstractTextEditor;
-import org.eclipse.ui.texteditor.WorkbenchChainedTextFontFieldEditor;
//
//import org.phpeclipse.phpdt.internal.ui.JavaPlugin;
//import org.phpeclipse.phpdt.internal.ui.preferences.NewJavaProjectPreferencePage;
@@ -535,7 +534,7 @@ public class PreferenceConstants {
* Value is of type Boolean.
*
*/
- public final static String EDITOR_PROBLEM_INDICATION = "problemIndication"; //$NON-NLS-1$
+// public final static String EDITOR_PROBLEM_INDICATION = "problemIndication"; //$NON-NLS-1$
/**
* A named preference that holds the color used to render problem indicators.
@@ -548,7 +547,7 @@ public class PreferenceConstants {
* @see org.eclipse.jface.resource.StringConverter
* @see org.eclipse.jface.preference.PreferenceConverter
*/
- public final static String EDITOR_PROBLEM_INDICATION_COLOR = "problemIndicationColor"; //$NON-NLS-1$
+// public final static String EDITOR_PROBLEM_INDICATION_COLOR = "problemIndicationColor"; //$NON-NLS-1$
/**PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR;
* A named preference that controls whether the editor shows warning indicators in text (squiggly lines).
@@ -556,7 +555,7 @@ public class PreferenceConstants {
* Value is of type Boolean.
*
*/
- public final static String EDITOR_WARNING_INDICATION = "warningIndication"; //$NON-NLS-1$
+// public final static String EDITOR_WARNING_INDICATION = "warningIndication"; //$NON-NLS-1$
/**
* A named preference that holds the color used to render warning indicators.
@@ -569,7 +568,7 @@ public class PreferenceConstants {
* @see org.eclipse.jface.resource.StringConverter
* @see org.eclipse.jface.preference.PreferenceConverter
*/
- public final static String EDITOR_WARNING_INDICATION_COLOR = "warningIndicationColor"; //$NON-NLS-1$
+// public final static String EDITOR_WARNING_INDICATION_COLOR = "warningIndicationColor"; //$NON-NLS-1$
/**
* A named preference that controls whether the editor shows task indicators in text (squiggly lines).
@@ -1137,6 +1136,28 @@ public class PreferenceConstants {
public final static String EDITOR_JAVA_DEFAULT_BOLD = IPreferenceConstants.PHP_DEFAULT + EDITOR_BOLD_SUFFIX;
/**
+ * A named preference that holds the color used to render task tags.
+ *
+ * Value is of type String. A RGB color value encoded as a string
+ * using class PreferenceConverter
+ *
+ *
+ * @see org.eclipse.jface.resource.StringConverter
+ * @see org.eclipse.jface.preference.PreferenceConverter
+ * @since 2.1
+ */
+ public final static String EDITOR_TASK_TAG_COLOR= IPreferenceConstants.TASK_TAG;
+
+ /**
+ * A named preference that controls whether task tags are rendered in bold.
+ *
+ * Value is of type Boolean.
+ *
+ * @since 2.1
+ */
+ public final static String EDITOR_TASK_TAG_BOLD= IPreferenceConstants.TASK_TAG + EDITOR_BOLD_SUFFIX;
+
+ /**
* A named preference that holds the color used to render phpdoc keywords.
*
* Value is of type String. A RGB color value encoded as a string
@@ -1394,6 +1415,278 @@ public class PreferenceConstants {
* @since 2.1
*/
public static final String EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER = "browserLikeLinksKeyModifier"; //$NON-NLS-1$
+ /**
+ * A named preference that controls whether occurrences are marked in the editor.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public static final String EDITOR_MARK_OCCURRENCES= "markOccurrences"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether occurrences are sticky in the editor.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public static final String EDITOR_STICKY_OCCURRENCES= "stickyOccurrences"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls disabling of the overwrite mode.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public static final String EDITOR_DISABLE_OVERWRITE_MODE= "disable_overwrite_mode"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls the "smart semicolon" smart typing handler
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public static final String EDITOR_SMART_SEMICOLON= "smart_semicolon"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls the "smart opening brace" smart typing handler
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public static final String EDITOR_SMART_OPENING_BRACE= "smart_opening_brace"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls the smart tab behaviour.
+ *
+ * Value is of type Boolean.
+ *
+ * @since 3.0
+ */
+ public static final String EDITOR_SMART_TAB= "smart_tab"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether Java comments should be
+ * spell-checked.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_CHECK_SPELLING= ISpellCheckPreferenceKeys.SPELLING_CHECK_SPELLING;
+
+ /**
+ * A named preference that controls whether words containing digits should
+ * be skipped during spell-checking.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_IGNORE_DIGITS= ISpellCheckPreferenceKeys.SPELLING_IGNORE_DIGITS;
+
+ /**
+ * A named preference that controls whether mixed case words should be
+ * skipped during spell-checking.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_IGNORE_MIXED= ISpellCheckPreferenceKeys.SPELLING_IGNORE_MIXED;
+
+ /**
+ * A named preference that controls whether sentence capitalization should
+ * be ignored during spell-checking.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_IGNORE_SENTENCE= ISpellCheckPreferenceKeys.SPELLING_IGNORE_SENTENCE;
+
+ /**
+ * A named preference that controls whether upper case words should be
+ * skipped during spell-checking.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_IGNORE_UPPER= ISpellCheckPreferenceKeys.SPELLING_IGNORE_UPPER;
+
+ /**
+ * A named preference that controls whether urls should be ignored during
+ * spell-checking.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_IGNORE_URLS= ISpellCheckPreferenceKeys.SPELLING_IGNORE_URLS;
+
+ /**
+ * A named preference that controls the locale used for spell-checking.
+ *
+ * Value is of type String.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_LOCALE= ISpellCheckPreferenceKeys.SPELLING_LOCALE;
+
+ /**
+ * A named preference that controls the number of proposals offered during
+ * spell-checking.
+ *
+ * Value is of type Integer.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_PROPOSAL_THRESHOLD= ISpellCheckPreferenceKeys.SPELLING_PROPOSAL_THRESHOLD;
+
+ /**
+ * A named preference that specifies the workspace user dictionary.
+ *
+ * Value is of type Integer.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_USER_DICTIONARY= ISpellCheckPreferenceKeys.SPELLING_USER_DICTIONARY;
+
+ /**
+ * A named preference that specifies whether spelling dictionaries are available to content assist.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+// public final static String SPELLING_ENABLE_CONTENTASSIST= ISpellCheckPreferenceKeys.SPELLING_ENABLE_CONTENTASSIST;
+
+ /**
+ * A named preference that controls whether code snippets are formatted
+ * in Javadoc comments.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_FORMATSOURCE= "comment_format_source_code"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether description of Javadoc
+ * parameters are indented.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_INDENTPARAMETERDESCRIPTION= "comment_indent_parameter_description"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether the header comment of
+ * a Java source file is formatted.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_FORMATHEADER= "comment_format_header"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether Javadoc root tags
+ * are indented.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_INDENTROOTTAGS= "comment_indent_root_tags"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether Javadoc comments
+ * are formatted by the content formatter.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_FORMAT= "comment_format_comments"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether a new line is inserted
+ * after Javadoc root tag parameters.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_NEWLINEFORPARAMETER= "comment_new_line_for_parameter"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether an empty line is inserted before
+ * the Javadoc root tag block.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_SEPARATEROOTTAGS= "comment_separate_root_tags"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether blank lines are cleared during formatting
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_CLEARBLANKLINES= "comment_clear_blank_lines"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls the line length of comments.
+ *
+ * Value is of type Integer. The value must be at least 4 for reasonable formatting.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_LINELENGTH= "comment_line_length"; //$NON-NLS-1$
+
+ /**
+ * A named preference that controls whether html tags are formatted.
+ *
+ * Value is of type Boolean.
+ *
+ *
+ * @since 3.0
+ */
+ public final static String FORMATTER_COMMENT_FORMATHTML= "comment_format_html"; //$NON-NLS-1$
/**
* A named preference that controls if the Java code assist gets auto activated.
@@ -1790,29 +2083,29 @@ public class PreferenceConstants {
PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_FIND_SCOPE_COLOR, new RGB(185, 176, 180));
- store.setDefault(PreferenceConstants.EDITOR_PROBLEM_INDICATION, true);
- PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR, new RGB(255, 0, 128));
- store.setDefault(PreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER, true);
-
- store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION, true);
- PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_WARNING_INDICATION_COLOR, new RGB(244, 200, 45));
- store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER, true);
-
- store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION, false);
- PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_TASK_INDICATION_COLOR, new RGB(0, 128, 255));
- store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER, false);
-
- store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION, false);
- PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR, new RGB(34, 164, 99));
- store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER, false);
-
- store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION, false);
- PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR, new RGB(192, 192, 192));
- store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER, false);
-
- store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION, false);
- PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR, new RGB(0, 0, 0));
- store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER, false);
+// store.setDefault(PreferenceConstants.EDITOR_PROBLEM_INDICATION, true);
+// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR, new RGB(255, 0, 128));
+// store.setDefault(PreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER, true);
+//
+// store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION, true);
+// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_WARNING_INDICATION_COLOR, new RGB(244, 200, 45));
+// store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER, true);
+//
+// store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION, false);
+// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_TASK_INDICATION_COLOR, new RGB(0, 128, 255));
+// store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER, false);
+//
+// store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION, false);
+// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR, new RGB(34, 164, 99));
+// store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER, false);
+//
+// store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION, false);
+// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR, new RGB(192, 192, 192));
+// store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER, false);
+//
+// store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION, false);
+// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR, new RGB(0, 0, 0));
+// store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER, false);
store.setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, true);
store.setDefault(PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE, false);
@@ -1824,7 +2117,7 @@ public class PreferenceConstants {
store.setDefault(PreferenceConstants.EDITOR_LINE_NUMBER_RULER, false);
PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(0, 0, 0));
- WorkbenchChainedTextFontFieldEditor.startPropagate(store, JFaceResources.TEXT_FONT);
+// WorkbenchChainedTextFontFieldEditor.startPropagate(store, JFaceResources.TEXT_FONT);
PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_LINKED_POSITION_COLOR, new RGB(0, 200, 100));
PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_LINK_COLOR, new RGB(0, 0, 255));