From: incastrix Date: Fri, 2 Oct 2009 22:17:50 +0000 (+0000) Subject: Refactory UI plugin. X-Git-Url: http://secure.phpeclipse.com Refactory UI plugin. --- diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java index 7b7d286..055fea5 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java @@ -18,4 +18,390 @@ public interface IPreferenceConstants { // "_show_html_files_local"; // public static final String PHP_SHOW_XML_FILES_LOCAL = // "_show_xml_files_local"; -} + /** + * 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$ + + // public static final String LOCALHOST_PREF = "_localhost"; + // public static final String DOCUMENTROOT_PREF = "_documentroot"; + // public static final String XAMPP_START_PREF = "_xampp_start_pref"; + // + // public static final String XAMPP_STOP_PREF = "_xampp_stop_pref"; + // + // public static final String MYSQL_RUN_PREF = "_mysql_run_pref"; + // + // public static final String MYSQL_START_BACKGROUND = + // "_mysql_start_background"; + // + // public static final String MYSQL_PREF = "__mysql_start"; + // + // public static final String APACHE_RUN_PREF = "_apache_run_pref"; + // + // public static final String APACHE_START_BACKGROUND = + // "_apache_start_background"; + // + // public static final String APACHE_START_PREF = "__apache_start"; + // + // public static final String APACHE_STOP_BACKGROUND = + // "_apache_stop_background"; + // + // public static final String APACHE_STOP_PREF = "__apache_stop"; + // + // 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 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_PARSER_DEFAULT = "_php_parser_default"; + + // public static final String PHP_INTERNAL_PARSER = "_php_internal_parser"; + // public static final String PHP_EXTERNAL_PARSER = "_php_external_parser"; + // public static final String PHP_PARSE_ON_SAVE = "_php_parse_on_save"; + public static final String PHP_MULTILINE_COMMENT = "_php_multilineComment"; + + public static final String PHP_MULTILINE_COMMENT_BOLD = "_php_multilineComment_bold"; + + public static final String PHP_MULTILINE_COMMENT_ITALIC = "_php_multilineComment_italic"; + + public static final String PHP_MULTILINE_COMMENT_UNDERLINE = "_php_multilineComment_underline"; + + /** + * The color key for operators and brackets in PHP code (value + * "__php_operator"). + * + * @since 3.0 + */ + public static final String PHP_OPERATOR = "__php_operator"; //$NON-NLS-1$ + + /** + * The color key for {} in PHP code (value + * "__php_brace_operator"). + * + * @since 3.0 + */ + public static final String PHP_BRACE_OPERATOR = "__php_brace_operator"; //$NON-NLS-1$ + + /** + * A named preference that holds the color used to render operators and + * brackets. + *

+ * 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 3.0 + */ + public final static String EDITOR_PHP_OPERATOR_COLOR = PHP_OPERATOR; + + /** + * A named preference that controls whether operators and brackets are + * rendered in bold. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String EDITOR_PHP_OPERATOR_BOLD = PHP_OPERATOR + + EDITOR_BOLD_SUFFIX; + + /** + * A named preference that controls whether operators and brackets are + * rendered in italic. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String EDITOR_PHP_OPERATOR_ITALIC = PHP_OPERATOR + + EDITOR_ITALIC_SUFFIX; + + /** + * A named preference that holds the color used to render operators and + * brackets. + *

+ * 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 3.0 + */ + public final static String EDITOR_PHP_BRACE_OPERATOR_COLOR = PHP_BRACE_OPERATOR; + + /** + * A named preference that controls whether operators and brackets are + * rendered in bold. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String EDITOR_PHP_BRACE_OPERATOR_BOLD = PHP_BRACE_OPERATOR + + EDITOR_BOLD_SUFFIX; + + /** + * A named preference that controls whether operators and brackets are + * rendered in italic. + *

+ * Value is of type Boolean. + *

+ * + * @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 + * "__php_keyword_return"). + * + * @since 3.0 + */ + public static final String PHP_KEYWORD_RETURN = "__php_keyword_return"; //$NON-NLS-1$ + + /** + * A named preference that holds the color used to render the 'return' + * keyword. + *

+ * 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 3.0 + */ + public final static String EDITOR_PHP_KEYWORD_RETURN_COLOR = PHP_KEYWORD_RETURN; + + /** + * A named preference that controls whether 'return' keyword is rendered in + * bold. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String EDITOR_PHP_KEYWORD_RETURN_BOLD = PHP_KEYWORD_RETURN + + EDITOR_BOLD_SUFFIX; + + /** + * A named preference that controls whether 'return' keyword is rendered in + * italic. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = PHP_KEYWORD_RETURN + + EDITOR_ITALIC_SUFFIX; + + public static final String PHP_SINGLELINE_COMMENT = "_php_singlelineComment"; + + public static final String PHP_SINGLELINE_COMMENT_BOLD = "_php_singlelineComment_bold";//$NON-NLS-1$ + + public static final String PHP_SINGLELINE_COMMENT_ITALIC = "_php_singlelineComment_italic";//$NON-NLS-1$ + + public static final String PHP_SINGLELINE_COMMENT_UNDERLINE = "_php_singlelineComment_underline";//$NON-NLS-1$ + + public static final String PHP_TAG = "_php_tag";//$NON-NLS-1$ + + public static final String PHP_TAG_BOLD = "_php_tag_bold";//$NON-NLS-1$ + + public static final String PHP_TAG_ITALIC = "_php_tag_italic";//$NON-NLS-1$ + + public static final String PHP_TAG_UNDERLINE = "_php_tag_underline";//$NON-NLS-1$ + + public static final String PHP_KEYWORD = "_php_keyword";//$NON-NLS-1$ + + public static final String PHP_KEYWORD_BOLD = "_php_keyword_bold";//$NON-NLS-1$ + + public static final String PHP_KEYWORD_ITALIC = "_php_keyword_italic";//$NON-NLS-1$ + + public static final String PHP_KEYWORD_UNDERLINE = "_php_keyword_underline";//$NON-NLS-1$ + + public static final String PHP_VARIABLE = "_php_variable";//$NON-NLS-1$ + + public static final String PHP_VARIABLE_BOLD = "_php_variable_bold";//$NON-NLS-1$ + + public static final String PHP_VARIABLE_ITALIC = "_php_variable_italic";//$NON-NLS-1$ + + 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$ + + public static final String PHP_TYPE_ITALIC = "_php_type_italic";//$NON-NLS-1$ + + public static final String PHP_TYPE_UNDERLINE = "_php_type_underline";//$NON-NLS-1$ + + public static final String PHP_CONSTANT = "_php_constant";//$NON-NLS-1$ + + public static final String PHP_CONSTANT_BOLD = "_php_constant_bold";//$NON-NLS-1$ + + public static final String PHP_CONSTANT_ITALIC = "_php_constant_italic";//$NON-NLS-1$ + + public static final String PHP_CONSTANT_UNDERLINE = "_php_constant_underline";//$NON-NLS-1$ + + public static final String PHP_FUNCTIONNAME = "_php_functionname";//$NON-NLS-1$ + + public static final String PHP_FUNCTIONNAME_BOLD = "_php_functionname_bold";//$NON-NLS-1$ + + public static final String PHP_FUNCTIONNAME_ITALIC = "_php_functionname_italic";//$NON-NLS-1$ + + public static final String PHP_FUNCTIONNAME_UNDERLINE = "_php_functionname_underline";//$NON-NLS-1$ + + public static final String PHP_STRING_DQ = "_php_string";//$NON-NLS-1$ + + public static final String PHP_STRING_BOLD_DQ = "_php_string_bold"; + + public static final String PHP_STRING_ITALIC_DQ = "_php_string_italic"; + + public static final String PHP_STRING_UNDERLINE_DQ = "_php_string_underline"; + + public static final String PHP_STRING_SQ = "_php_string_sq";//$NON-NLS-1$ + + public static final String PHP_STRING_BOLD_SQ = "_php_string_sq_bold"; + + 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"; + + public static final String PHP_DEFAULT_ITALIC = "_php_default_italic"; + + public static final String PHP_DEFAULT_UNDERLINE = "_php_default_underline"; + + public static final String TASK_TAG = "_php_comment_task_tag"; //$NON-NLS-1$ + + public static final String TASK_TAG_BOLD = "_php_comment_task_tag_bold"; //$NON-NLS-1$ + + /** + * The color key for PHPDoc keywords (@foo) in PHPDoc comments. + */ + public static final String PHPDOC_KEYWORD = "_php_doc_keyword"; //$NON-NLS-1$ + + public static final String PHPDOC_KEYWORD_BOLD = "_php_doc_keyword_bold"; + + public static final String PHPDOC_KEYWORD_ITALIC = "_php_doc_keyword_italic"; + + public static final String PHPDOC_KEYWORD_UNDERLINE = "_php_doc_keyword_underline"; + + /** + * The color key for HTML tags (<foo>) in PHPDoc + * comments. + */ + public static final String PHPDOC_TAG = "_php_doc_tag"; //$NON-NLS-1$ + + public static final String PHPDOC_TAG_BOLD = "_php_doc_tag_bold"; + + public static final String PHPDOC_TAG_ITALIC = "_php_doc_tag_italic"; + + public static final String PHPDOC_TAG_UNDERLINE = "_php_doc_tag_underline"; + + /** + * The color key for PHPDoc links ({foo}) in PHPDoc + * comments. + */ + public static final String PHPDOC_LINK = "_php_doc_link"; //$NON-NLS-1$ + + public static final String PHPDOC_LINK_BOLD = "_php_doc_link_bold"; + + public static final String PHPDOC_LINK_ITALIC = "_php_doc_link_italic"; + + public static final String PHPDOC_LINK_UNDERLINE = "_php_doc_link_underline"; + + /** + * The color key for everthing in PHPDoc comments for which no other color + * is specified. + */ + public static final String PHPDOC_DEFAULT = "_php_doc_default"; //$NON-NLS-1$ + + public static final String PHPDOC_DEFAULT_BOLD = "_php_doc_default_bold"; + + public static final String PHPDOC_DEFAULT_ITALIC = "_php_doc_default_italic"; + + public static final String PHPDOC_DEFAULT_UNDERLINE = "_php_doc_default_underline"; + + // public static final String LINKED_POSITION_COLOR = + // "_linkedPositionColor"; + // public static final String PHP_EDITOR_BACKGROUND = + // "_php_editor_background"; + public static final String PHP_USERDEF_XMLFILE = "_userdef_xmlfile"; + + /** Preference key for showing the line number ruler */ + // public final static String LINE_NUMBER_RULER = "_lineNumberRuler"; + // //$NON-NLS-1$ + /** Preference key for the foreground color of the line numbers */ + // public final static String LINE_NUMBER_COLOR = "_lineNumberColor"; + // //$NON-NLS-1$ + // public final static String PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT = + // "_defaultBackgroundColor"; //$NON-NLS-1$ + // public final static String PREFERENCE_COLOR_BACKGROUND = + // "backgroundColor"; //$NON-NLS-1$ + /** Preference key for content assist proposal color */ + public final static String PROPOSALS_FOREGROUND = "content_assist_proposals_foreground"; //$NON-NLS-1$ + + /** Preference key for content assist proposal color */ + public final static String PROPOSALS_BACKGROUND = "content_assist_proposals_background"; //$NON-NLS-1$ + + public static final String EDITOR_EVALUTE_TEMPORARY_PROBLEMS = null; + + public static final String EDITOR_CORRECTION_INDICATION = null; + + // 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"; + } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java index 84b2c24..fb5508a 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java @@ -13,29 +13,114 @@ package net.sourceforge.phpeclipse.ui; +import org.eclipse.jface.resource.JFaceResources; +import java.io.File; import java.io.IOException; +//import java.io.InputStream; import java.net.URL; - -import net.sourceforge.phpeclipse.ui.templates.template.HTMLContextType; -import net.sourceforge.phpeclipse.ui.templates.template.JSContextType; -import net.sourceforge.phpeclipse.ui.templates.template.SmartyContextType; -import net.sourceforge.phpeclipse.ui.templates.template.XMLContextType; - +//import java.util.Enumeration; +import java.util.HashMap; +//import java.util.PropertyResourceBundle; + +//import net.sourceforge.phpdt.core.JavaCore; +import net.sourceforge.phpdt.core.IBuffer; +import net.sourceforge.phpdt.core.ICompilationUnit; +import net.sourceforge.phpdt.core.IJavaElement; +import net.sourceforge.phpdt.core.WorkingCopyOwner; +import net.sourceforge.phpdt.internal.core.JavaModelManager; +import net.sourceforge.phpdt.internal.core.util.Util; +import net.sourceforge.phpdt.internal.corext.template.php.CodeTemplateContextType; +import net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType; +import net.sourceforge.phpdt.internal.corext.template.php.JavaContextType; +import net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType; +import net.sourceforge.phpdt.internal.ui.IJavaStatusConstants; +import net.sourceforge.phpdt.internal.ui.JavaElementAdapterFactory; +import net.sourceforge.phpdt.internal.ui.ResourceAdapterFactory; +import net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferenceCache; +import net.sourceforge.phpdt.internal.ui.preferences.MockupPreferenceStore; +import net.sourceforge.phpdt.internal.ui.text.PreferencesAdapter; +import net.sourceforge.phpdt.internal.ui.text.folding.JavaFoldingStructureProviderRegistry; +import net.sourceforge.phpdt.internal.ui.text.java.hover.JavaEditorTextHoverDescriptor; +import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry; +import net.sourceforge.phpdt.internal.ui.viewsupport.ProblemMarkerManager; +import net.sourceforge.phpdt.ui.IContextMenuConstants; +import net.sourceforge.phpdt.ui.IWorkingCopyManager; +import net.sourceforge.phpdt.ui.text.JavaTextTools; +import net.sourceforge.phpdt.ui.PreferenceConstants; +import net.sourceforge.phpeclipse.PHPeclipsePlugin; +import net.sourceforge.phpeclipse.builder.ExternalEditorInput; +import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider; +import net.sourceforge.phpeclipse.builder.FileStorage; +import net.sourceforge.phpeclipse.builder.IdentifierIndexManager; +import net.sourceforge.phpeclipse.phpeditor.DocumentAdapter; +import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider; +import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider; +//import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr; +import net.sourceforge.phpeclipse.phpeditor.WorkingCopyManager; +//import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider; + + +import net.sourceforge.phpeclipse.ui.templates.template.HTMLTemplateContextType; +//import net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType; + +import net.sourceforge.phpeclipse.ui.templates.template.JSTemplateContextType; +import net.sourceforge.phpeclipse.ui.templates.template.SmartyTemplateContextType; +import net.sourceforge.phpeclipse.ui.templates.template.XMLTemplateContextType; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceChangeEvent; +import org.eclipse.core.resources.ISavedState; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.resources.WorkspaceJob; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdapterManager; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +//import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.Preferences.IPropertyChangeListener; +import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.action.GroupMarker; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.Separator; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferenceConverter; +//import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.templates.ContextTypeRegistry; import org.eclipse.jface.text.templates.persistence.TemplateStore; +//import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IEditorDescriptor; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorRegistry; +import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry; import org.eclipse.ui.editors.text.templates.ContributionTemplateStore; +import org.eclipse.ui.ide.IDE; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.ui.texteditor.ChainedPreferenceStore; +import org.eclipse.ui.texteditor.ConfigurationElementSorter; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.ui.texteditor.ITextEditor; +import org.osgi.framework.BundleContext; /** * The web development tools UI plugin. @@ -44,8 +129,23 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants { public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.ui"; + public static final String EDITOR_ID = WebUI.PLUGIN_ID + ".PHPUnitEditor"; + private static final String CUSTOM_TEMPLATES_KEY = "net.sourceforge.phpeclipse.ui.templates"; //$NON-NLS-1$ + /** + * The key to store customized code templates. + * + * @since 3.0 + */ + private static final String CODE_TEMPLATES_KEY = "net.sourceforge.phpdt.ui.text.custom_code_templates"; //$NON-NLS-1$ + /** + * The maximum number of allowed proposals by category + */ + public final static int MAX_PROPOSALS = 200; + + public final static String PHP_NATURE_ID = PLUGIN_ID + ".phpnature"; + // Constants --------------------------------------------------------------- public static final String ICON_OVERLAY_ERROR = "full/ovr16/error_co.gif"; //$NON-NLS-1$ @@ -56,6 +156,67 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants { /** The shared instance. */ private static WebUI plugin; + + /** + * The combined preference store. + * + * @since 3.0 + */ + private IPreferenceStore fCombinedPreferenceStore; + + /** + * The coded template store for the java editor. + * + * @since 3.0 + */ + private TemplateStore fCodeTemplateStore; + + /** + * The code template context type registry for the java editor. + * + * @since 3.0 + */ + private ContextTypeRegistry fCodeTemplateContextTypeRegistry; + + /** + * The template context type registry for the java editor. + * + * @since 3.0 + */ + private ContextTypeRegistry fContextTypeRegistry; + + private ResourceAdapterFactory fResourceAdapterFactory; + + private JavaElementAdapterFactory fJavaElementAdapterFactory; + + private ICompilationUnitDocumentProvider fCompilationUnitDocumentProvider; + + private JavaTextTools fJavaTextTools; + + private IWorkingCopyManager fWorkingCopyManager; + + private IPropertyChangeListener fFontPropertyChangeListener; + + private ProblemMarkerManager fProblemMarkerManager; + + private MockupPreferenceStore fMockupPreferenceStore; + + private ImageDescriptorRegistry fImageDescriptorRegistry; + + private JavaEditorTextHoverDescriptor[] fJavaEditorTextHoverDescriptors; + + private MembersOrderPreferenceCache fMembersOrderPreferenceCache; + + private HashMap fIndexManagerMap = new HashMap(); + + /** + * The extension point registry for the + * net.sourceforge.phpdt.ui.javaFoldingStructureProvider + * extension point. + * + * @since 3.0 + */ + private JavaFoldingStructureProviderRegistry fFoldingStructureProviderRegistry; public static IWorkbenchPage getActivePage() { return getDefault().internalGetActivePage(); @@ -113,10 +274,10 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants { if (fRegistry == null) { // create an configure the contexts available in the editor fRegistry = new ContributionContextTypeRegistry(); - fRegistry.addContextType(XMLContextType.XML_CONTEXT_TYPE); - fRegistry.addContextType(HTMLContextType.HTML_CONTEXT_TYPE); - fRegistry.addContextType(SmartyContextType.SMARTY_CONTEXT_TYPE); - fRegistry.addContextType(JSContextType.JS_CONTEXT_TYPE); + fRegistry.addContextType(XMLTemplateContextType.XML_CONTEXT_TYPE); + fRegistry.addContextType(HTMLTemplateContextType.HTML_CONTEXT_TYPE); + fRegistry.addContextType(SmartyTemplateContextType.SMARTY_CONTEXT_TYPE); + fRegistry.addContextType(JSTemplateContextType.JS_CONTEXT_TYPE); } return fRegistry; } @@ -165,19 +326,6 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants { return fStore; } - protected void initializeDefaultPreferences(IPreferenceStore store) { - store.setDefault(PHP_LOCALHOST_PREF, "http://localhost"); - store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot() - .getFullPath().toString()); - // store.setDefault(PHP_BOOKMARK_DEFAULT, ""); - - store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "false"); - store.setDefault(PHP_BRING_TO_TOP_PREVIEW_DEFAULT, "false"); - store.setDefault(PHP_STICKY_BROWSER_URL_DEFAULT, "false"); - // store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true"); - // store.setDefault(PHP_SHOW_XML_FILES_LOCAL, "false"); - } - /* * @see AbstractUIPlugin#initializeImageRegistry(ImageRegistry) */ @@ -201,4 +349,537 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants { log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "" + e.getLocalizedMessage(), e)); } + + public static String getPluginId() { + return getDefault().getBundle().getSymbolicName(); + } + + /** + * Returns a combined preference store, this store is read-only. + * + * @return the combined preference store + * + * @since 3.0 + */ + public IPreferenceStore getCombinedPreferenceStore() { + if (fCombinedPreferenceStore == null) { + IPreferenceStore generalTextStore = EditorsUI.getPreferenceStore(); + fCombinedPreferenceStore = new ChainedPreferenceStore( + new IPreferenceStore[] { + getPreferenceStore(), + new PreferencesAdapter(WebUI + .getDefault().getPluginPreferences()), + generalTextStore }); + } + return fCombinedPreferenceStore; + } + + // TODO: refactor this into a better method name ! + public synchronized ICompilationUnitDocumentProvider getCompilationUnitDocumentProvider() { + if (fCompilationUnitDocumentProvider == null) + fCompilationUnitDocumentProvider = new PHPDocumentProvider(); + return fCompilationUnitDocumentProvider; + } + + public synchronized JavaTextTools getJavaTextTools() { + if (fJavaTextTools == null) + fJavaTextTools = new JavaTextTools(getPreferenceStore(), /*JavaCore + .getPlugin().*/getPluginPreferences()); + return fJavaTextTools; + } + + public synchronized IWorkingCopyManager getWorkingCopyManager() { + if (fWorkingCopyManager == null) { + ICompilationUnitDocumentProvider provider = getCompilationUnitDocumentProvider(); + fWorkingCopyManager = new WorkingCopyManager(provider); + } + return fWorkingCopyManager; + } + + public synchronized ProblemMarkerManager getProblemMarkerManager() { + if (fProblemMarkerManager == null) + fProblemMarkerManager = new ProblemMarkerManager(); + return fProblemMarkerManager; + } + + /** + * Returns the mockup preference store for firing events and registering + * listeners on project setting changes. Temporary solution. + */ + public MockupPreferenceStore getMockupPreferenceStore() { + if (fMockupPreferenceStore == null) + fMockupPreferenceStore = new MockupPreferenceStore(); + + return fMockupPreferenceStore; + } + + public static ImageDescriptorRegistry getImageDescriptorRegistry() { + return getDefault().internalGetImageDescriptorRegistry(); + } + + private ImageDescriptorRegistry internalGetImageDescriptorRegistry() { + if (fImageDescriptorRegistry == null) + fImageDescriptorRegistry = new ImageDescriptorRegistry(); + return fImageDescriptorRegistry; + } + + /** + * Returns the registry of the extensions to the + * net.sourceforge.phpdt.ui.javaFoldingStructureProvider + * extension point. + * + * @return the registry of contributed + * IJavaFoldingStructureProvider + * @since 3.0 + */ + public synchronized JavaFoldingStructureProviderRegistry getFoldingStructureProviderRegistry() { + if (fFoldingStructureProviderRegistry == null) + fFoldingStructureProviderRegistry = new JavaFoldingStructureProviderRegistry(); + return fFoldingStructureProviderRegistry; + } + /** + * Returns all Java editor text hovers contributed to the workbench. + * + * @return an array of JavaEditorTextHoverDescriptor + * @since 2.1 + */ + public JavaEditorTextHoverDescriptor[] getJavaEditorTextHoverDescriptors() { + if (fJavaEditorTextHoverDescriptors == null) { + fJavaEditorTextHoverDescriptors = JavaEditorTextHoverDescriptor + .getContributedHovers(); + ConfigurationElementSorter sorter = new ConfigurationElementSorter() { + /* + * @see org.eclipse.ui.texteditor.ConfigurationElementSorter#getConfigurationElement(java.lang.Object) + */ + public IConfigurationElement getConfigurationElement( + Object object) { + return ((JavaEditorTextHoverDescriptor) object) + .getConfigurationElement(); + } + }; + sorter.sort(fJavaEditorTextHoverDescriptors); + + // The Problem hover has to be the first and the Annotation hover + // has to + // be the last one in the JDT UI's hover list + int length = fJavaEditorTextHoverDescriptors.length; + int first = -1; + int last = length - 1; + int problemHoverIndex = -1; + int annotationHoverIndex = -1; + for (int i = 0; i < length; i++) { + if (!fJavaEditorTextHoverDescriptors[i].getId().startsWith( + PLUGIN_ID)) { + if (problemHoverIndex == -1 || annotationHoverIndex == -1) + continue; + else { + last = i - 1; + break; + } + } + if (first == -1) + first = i; + + if (fJavaEditorTextHoverDescriptors[i].getId().equals( + "net.sourceforge.phpdt.ui.AnnotationHover")) { //$NON-NLS-1$ + annotationHoverIndex = i; + continue; + } + if (fJavaEditorTextHoverDescriptors[i].getId().equals( + "net.sourceforge.phpdt.ui.ProblemHover")) { //$NON-NLS-1$ + problemHoverIndex = i; + continue; + } + } + + JavaEditorTextHoverDescriptor hoverDescriptor = null; + + if (first > -1 && problemHoverIndex > -1 + && problemHoverIndex != first) { + // move problem hover to beginning + hoverDescriptor = fJavaEditorTextHoverDescriptors[first]; + fJavaEditorTextHoverDescriptors[first] = fJavaEditorTextHoverDescriptors[problemHoverIndex]; + fJavaEditorTextHoverDescriptors[problemHoverIndex] = hoverDescriptor; + + // update annotation hover index if needed + if (annotationHoverIndex == first) + annotationHoverIndex = problemHoverIndex; + } + + if (annotationHoverIndex > -1 && annotationHoverIndex != last) { + // move annotation hover to end + hoverDescriptor = fJavaEditorTextHoverDescriptors[last]; + fJavaEditorTextHoverDescriptors[last] = fJavaEditorTextHoverDescriptors[annotationHoverIndex]; + fJavaEditorTextHoverDescriptors[annotationHoverIndex] = hoverDescriptor; + } + + // Move Best Match hover to front + for (int i = 0; i < fJavaEditorTextHoverDescriptors.length - 1; i++) { + if (PreferenceConstants.ID_BESTMATCH_HOVER + .equals(fJavaEditorTextHoverDescriptors[i].getId())) { + hoverDescriptor = fJavaEditorTextHoverDescriptors[i]; + for (int j = i; j > 0; j--) + fJavaEditorTextHoverDescriptors[j] = fJavaEditorTextHoverDescriptors[j - 1]; + fJavaEditorTextHoverDescriptors[0] = hoverDescriptor; + break; + } + + } + } + + return fJavaEditorTextHoverDescriptors; + } + + public synchronized MembersOrderPreferenceCache getMemberOrderPreferenceCache() { + if (fMembersOrderPreferenceCache == null) + fMembersOrderPreferenceCache = new MembersOrderPreferenceCache(); + return fMembersOrderPreferenceCache; + } + /** + * Open a file in the Workbench that may or may not exist in the workspace. + * Must be run on the UI thread. + * + * @param filename + * @throws CoreException + */ + public ITextEditor openFileInTextEditor(String filename) + throws CoreException { + // reject directories + if (new File(filename).isDirectory()) + return null; + IWorkbench workbench = PlatformUI.getWorkbench(); + IWorkbenchWindow window = workbench.getWorkbenchWindows()[0]; + IWorkbenchPage page = window.getActivePage(); + IPath path = new Path(filename); + // If the file exists in the workspace, open it + IFile file = getWorkspace().getRoot().getFile(path); + IEditorPart editor; + ITextEditor textEditor; + if (file != null && file.exists()) { + editor = IDE.openEditor(page, file, true); + textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class); + } else { + // Otherwise open the stream directly + if (page == null) + return null; + FileStorage storage = new FileStorage(path); + IEditorRegistry registry = getWorkbench().getEditorRegistry(); + IEditorDescriptor desc = registry.getDefaultEditor(filename); + if (desc == null) { + desc = registry + .findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID); + // desc = registry.getDefaultEditor(); + } + IEditorInput input = new ExternalEditorInput(storage); + editor = page.openEditor(input, desc.getId()); + textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class); + // If the storage provider is not ours, we can't guarantee + // read/write. + if (textEditor != null) { + IDocumentProvider documentProvider = textEditor + .getDocumentProvider(); + if (!(documentProvider instanceof ExternalStorageDocumentProvider)) { + storage.setReadOnly(); + } + } + } + return textEditor; + } + /** + * Creates the PHP plugin standard groups in a context menu. + */ + public static void createStandardGroups(IMenuManager menu) { + if (!menu.isEmpty()) + return; + menu.add(new Separator(IContextMenuConstants.GROUP_NEW)); + menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO)); + menu.add(new Separator(IContextMenuConstants.GROUP_OPEN)); + menu.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW)); + menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE)); + menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE)); + menu.add(new Separator(IContextMenuConstants.GROUP_SEARCH)); + menu.add(new Separator(IContextMenuConstants.GROUP_BUILD)); + menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS)); + menu.add(new Separator(IContextMenuConstants.GROUP_VIEWER_SETUP)); + menu.add(new Separator(IContextMenuConstants.GROUP_PROPERTIES)); + } + + public IdentifierIndexManager getIndexManager(IProject iProject) { + IPath path = iProject.getWorkingLocation(/*WebUI*/PHPeclipsePlugin.PLUGIN_ID); + path = path.append("project.index"); + String indexFilename = path.toString(); + // try { + // IdentDB db = IdentDB.getInstance(); + // } catch (ClassNotFoundException e) { + // e.printStackTrace(); + // } catch (SQLException e) { + // e.printStackTrace(); + // } + IdentifierIndexManager indexManager = (IdentifierIndexManager) fIndexManagerMap + .get(indexFilename); + if (indexManager == null) { + indexManager = new IdentifierIndexManager(indexFilename); + fIndexManagerMap.put(indexFilename, indexManager); + } + return indexManager; + } + + /** + * Returns the template store for the code generation templates. + * + * @return the template store for the code generation templates + * @since 3.0 + */ + public TemplateStore getCodeTemplateStore() { + if (fCodeTemplateStore == null) { + fCodeTemplateStore = new ContributionTemplateStore( + getCodeTemplateContextRegistry(), getPreferenceStore(), + CODE_TEMPLATES_KEY); + try { + fCodeTemplateStore.load(); + } catch (IOException e) { + log(e); + } + } + + return fCodeTemplateStore; + } + /** + * Returns the template context type registry for the code generation + * templates. + * + * @return the template context type registry for the code generation + * templates + * @since 3.0 + */ + public ContextTypeRegistry getCodeTemplateContextRegistry() { + if (fCodeTemplateContextTypeRegistry == null) { + fCodeTemplateContextTypeRegistry = new ContributionContextTypeRegistry(); + + CodeTemplateContextType + .registerContextTypes(fCodeTemplateContextTypeRegistry); + } + + return fCodeTemplateContextTypeRegistry; + } + + public void openFileAndGotoOffset(String filename, int offset, int length) + throws CoreException { + ITextEditor textEditor = openFileInTextEditor(filename); + if (textEditor != null) { + // If a line number was given, go to it + if (offset >= 0) { + IDocument document = textEditor.getDocumentProvider() + .getDocument(textEditor.getEditorInput()); + textEditor.selectAndReveal(offset, length); + } + } + } + + public void openFileAndFindString(String filename, String findString) + throws CoreException { + ITextEditor textEditor = openFileInTextEditor(filename); + if (textEditor != null) { + // If a string was given, go to it + if (findString != null) { + try { + IDocument document = textEditor.getDocumentProvider() + .getDocument(textEditor.getEditorInput()); + int offset = document.search(0, findString, true, false, + true); + textEditor.selectAndReveal(offset, findString.length()); + } catch (BadLocationException e) { + // invalid text position -> do nothing + } + } + } + } + + public static void logErrorMessage(String message) { + log(new Status(IStatus.ERROR, getPluginId(),IJavaStatusConstants.INTERNAL_ERROR, message, null)); + } + public static void log(String message, Throwable t) { + log(error(message, t)); + } + public static IStatus error(Throwable t) { + return error("PHPeclipsePlugin.internalErrorOccurred", t); //$NON-NLS-1$ + } + + public static IStatus error(String message, Throwable t) { + return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, message, t); + } + + /** + * Resets the Java editor text hovers contributed to the workbench. + *

+ * This will force a rebuild of the descriptors the next time a client asks + * for them. + *

+ * + * @return an array of JavaEditorTextHoverDescriptor + * @since 2.1 + */ + public void resetJavaEditorTextHoverDescriptors() { + fJavaEditorTextHoverDescriptors = null; + } + + /** + * Returns the template context type registry for the java plugin. + * + * @return the template context type registry for the java plugin + * @since 3.0 + */ + public ContextTypeRegistry getTemplateContextRegistry() { + if (fContextTypeRegistry == null) { + fContextTypeRegistry = new ContributionContextTypeRegistry(); + + fContextTypeRegistry.addContextType(new JavaContextType()); + fContextTypeRegistry.addContextType(new JavaDocContextType()); + fContextTypeRegistry.addContextType(new HTMLContextType()); + } + + return fContextTypeRegistry; + } + // public static void logErrorMessage(String message) { + // log(new Status(IStatus.ERROR, getPluginId(), + // JavaStatusConstants.INTERNAL_ERROR, message, null)); + // } + + + + /* + * (non - Javadoc) Method declared in Plugin + */ + public void start(BundleContext context) throws Exception { + super.start(context); + + // JavaCore.start(this, context); + final JavaModelManager modelManager = JavaModelManager + .getJavaModelManager(); + try { + modelManager.configurePluginDebugOptions(); + + // request state folder creation (workaround 19885) + getStateLocation(); + // retrieve variable values + PHPeclipsePlugin.getDefault().getPluginPreferences() + .addPropertyChangeListener( + new JavaModelManager.PluginPreferencesListener()); + // manager.loadVariablesAndContainers(); + + final IWorkspace workspace = ResourcesPlugin.getWorkspace(); + workspace.addResourceChangeListener(modelManager.deltaState, + IResourceChangeEvent.PRE_BUILD + | IResourceChangeEvent.POST_BUILD + | IResourceChangeEvent.POST_CHANGE + | IResourceChangeEvent.PRE_DELETE + | IResourceChangeEvent.PRE_CLOSE); + + ISavedState savedState = workspace.addSaveParticipant( + /*PHPeclipsePlugin*/WebUI.this, modelManager); + + WorkspaceJob processSavedState = new WorkspaceJob( + Util.bind("savedState.jobName")) { //$NON-NLS-1$ + public IStatus runInWorkspace(IProgressMonitor monitor) + throws CoreException { + ISavedState savedState = workspace.addSaveParticipant( + /*PHPeclipsePlugin*/WebUI.this, modelManager); + if (savedState != null) { + modelManager.deltaState.getDeltaProcessor().overridenEventType + = IResourceChangeEvent.POST_CHANGE; + savedState.processResourceChangeEvents(modelManager.deltaState); + } + return Status.OK_STATUS; + } + }; + processSavedState.setSystem(true); + processSavedState.setPriority(Job.SHORT); // process asap + processSavedState.schedule(); + } catch (RuntimeException e) { + modelManager.shutdown(); + throw e; + } + + registerAdapters(); + + // if (USE_WORKING_COPY_OWNERS) { + WorkingCopyOwner.setPrimaryBufferProvider(new WorkingCopyOwner() { + public IBuffer createBuffer(ICompilationUnit workingCopy) { + ICompilationUnit original = workingCopy.getPrimary(); + IResource resource = original.getResource(); + if (resource instanceof IFile) + return new DocumentAdapter(workingCopy, (IFile) resource); + return DocumentAdapter.NULL; + } + }); + // } + + installPreferenceStoreBackwardsCompatibility(); + + } + + + private void registerAdapters() { + fJavaElementAdapterFactory = new JavaElementAdapterFactory(); + fResourceAdapterFactory = new ResourceAdapterFactory(); + + IAdapterManager manager = Platform.getAdapterManager(); + manager + .registerAdapters(fJavaElementAdapterFactory, + IJavaElement.class); + manager.registerAdapters(fResourceAdapterFactory, IResource.class); + } + + + + /** + * Installs backwards compatibility for the preference store. + */ + private void installPreferenceStoreBackwardsCompatibility() { + + /* + * Installs backwards compatibility: propagate the Java editor font from + * a pre-2.1 plug-in to the Platform UI's preference store to preserve + * the Java editor font from a pre-2.1 workspace. This is done only + * once. + */ + String fontPropagatedKey = "fontPropagated"; //$NON-NLS-1$ + if (getPreferenceStore().contains(JFaceResources.TEXT_FONT) + && !getPreferenceStore().isDefault(JFaceResources.TEXT_FONT)) { + if (!getPreferenceStore().getBoolean(fontPropagatedKey)) + PreferenceConverter + .setValue(PlatformUI.getWorkbench() + .getPreferenceStore(), + PreferenceConstants.EDITOR_TEXT_FONT, + PreferenceConverter.getFontDataArray( + getPreferenceStore(), + JFaceResources.TEXT_FONT)); + } + getPreferenceStore().setValue(fontPropagatedKey, true); + + /* + * Backwards compatibility: set the Java editor font in this plug-in's + * preference store to let older versions access it. Since 2.1 the Java + * editor font is managed by the workbench font preference page. + */ + PreferenceConverter.putValue(getPreferenceStore(), + JFaceResources.TEXT_FONT, JFaceResources.getFontRegistry() + .getFontData(PreferenceConstants.EDITOR_TEXT_FONT)); + + fFontPropertyChangeListener = new IPropertyChangeListener() { + public void propertyChange(PropertyChangeEvent event) { + if (PreferenceConstants.EDITOR_TEXT_FONT.equals(event + .getProperty())) + PreferenceConverter.putValue(getPreferenceStore(), + JFaceResources.TEXT_FONT, + JFaceResources.getFontRegistry().getFontData( + PreferenceConstants.EDITOR_TEXT_FONT)); + } + }; + // incastrix + /*JFaceResources.getFontRegistry().addListener( + fFontPropertyChangeListener);*/ + } + + } \ No newline at end of file diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/BasicCompletionProcessor.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/BasicCompletionProcessor.java index 5e355e3..1a25f97 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/BasicCompletionProcessor.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/BasicCompletionProcessor.java @@ -96,7 +96,7 @@ public class BasicCompletionProcessor extends TemplateCompletionProcessor { protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) { return WebUI.getDefault().getContextTypeRegistry().getContextType( - XMLContextType.XML_CONTEXT_TYPE); + XMLTemplateContextType.XML_CONTEXT_TYPE); } /** diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/HTMLContextType.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/HTMLTemplateContextType.java similarity index 93% rename from net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/HTMLContextType.java rename to net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/HTMLTemplateContextType.java index 365f53d..ca658c9 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/HTMLContextType.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/HTMLTemplateContextType.java @@ -16,7 +16,7 @@ import org.eclipse.jface.text.templates.TemplateContextType; /** * A very simple context type. */ -public class HTMLContextType extends TemplateContextType { +public class HTMLTemplateContextType extends TemplateContextType { /** This context's id */ public static final String HTML_CONTEXT_TYPE = "html"; //$NON-NLS-1$ @@ -24,7 +24,7 @@ public class HTMLContextType extends TemplateContextType { /** * Creates a new XML context type. */ - public HTMLContextType() { + public HTMLTemplateContextType() { addGlobalResolvers(); } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/JSContextType.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/JSTemplateContextType.java similarity index 93% rename from net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/JSContextType.java rename to net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/JSTemplateContextType.java index e0dca6a..3bc0000 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/JSContextType.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/JSTemplateContextType.java @@ -16,7 +16,7 @@ import org.eclipse.jface.text.templates.TemplateContextType; /** * A very simple context type. */ -public class JSContextType extends TemplateContextType { +public class JSTemplateContextType extends TemplateContextType { /** This context's id */ public static final String JS_CONTEXT_TYPE = "javascript"; //$NON-NLS-1$ @@ -24,7 +24,7 @@ public class JSContextType extends TemplateContextType { /** * Creates a new XML context type. */ - public JSContextType() { + public JSTemplateContextType() { addGlobalResolvers(); } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/SmartyContextType.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/SmartyTemplateContextType.java similarity index 92% rename from net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/SmartyContextType.java rename to net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/SmartyTemplateContextType.java index d5d9efa..b4a573c 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/SmartyContextType.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/SmartyTemplateContextType.java @@ -16,7 +16,7 @@ import org.eclipse.jface.text.templates.TemplateContextType; /** * A very simple context type. */ -public class SmartyContextType extends TemplateContextType { +public class SmartyTemplateContextType extends TemplateContextType { /** This context's id */ public static final String SMARTY_CONTEXT_TYPE = "smarty"; //$NON-NLS-1$ @@ -24,7 +24,7 @@ public class SmartyContextType extends TemplateContextType { /** * Creates a new XML context type. */ - public SmartyContextType() { + public SmartyTemplateContextType() { addGlobalResolvers(); } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/XMLContextType.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/XMLTemplateContextType.java similarity index 93% rename from net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/XMLContextType.java rename to net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/XMLTemplateContextType.java index 7765baa..4419b61 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/XMLContextType.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/templates/template/XMLTemplateContextType.java @@ -16,7 +16,7 @@ import org.eclipse.jface.text.templates.TemplateContextType; /** * A very simple context type. */ -public class XMLContextType extends TemplateContextType { +public class XMLTemplateContextType extends TemplateContextType { /** This context's id */ public static final String XML_CONTEXT_TYPE = "xml"; //$NON-NLS-1$ @@ -24,7 +24,7 @@ public class XMLContextType extends TemplateContextType { /** * Creates a new XML context type. */ - public XMLContextType() { + public XMLTemplateContextType() { addGlobalResolvers(); }