diff options
Diffstat (limited to 'bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst')
5 files changed, 9 insertions, 6 deletions
diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java index 5b28b70517..73e013d1b3 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java @@ -60,6 +60,8 @@ public class JSPUIMessages extends NLS { public static String OccurrencesSearchQuery_2; public static String Override_method_in; public static String Creating_files_encoding; + public static String Content_Assist_not_availab_UI_; + public static String Java_Content_Assist_is_not_UI_; static { // load message values from bundle file diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties index f0cb9537c3..d0553e1212 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties @@ -51,6 +51,8 @@ CleanupDocument.tooltip=Cleanup Document CleanupDocument.description=Cleanup Document OccurrencesSearchQuery_0={0} - {1} Occurrences in {2} OccurrencesSearchQuery_2=file +Content_Assist_not_availab_UI_=Content Assist not available at the current location +Java_Content_Assist_is_not_UI_=Java Content Assist is not available for the current cursor location # Override_method_in=Override method in ' Creating_files_encoding=Creating files encoding preference diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPCompletionProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPCompletionProcessor.java index b60b6ea553..96bce6036d 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPCompletionProcessor.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPCompletionProcessor.java @@ -27,10 +27,10 @@ import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation; import org.eclipse.jst.jsp.core.internal.java.JSPTranslation; import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter; +import org.eclipse.jst.jsp.ui.internal.JSPUIMessages; import org.eclipse.jst.jsp.ui.internal.Logger; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.ui.internal.IReleasable; -import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.sse.ui.internal.contentassist.IResourceDependentProcessor; import org.eclipse.wst.xml.core.document.IDOMDocument; @@ -131,7 +131,7 @@ public class JSPCompletionProcessor implements IContentAssistProcessor, IReleasa if(collector != null) { results = collector.getJSPCompletionProposals(); if (results == null || results.length < 1) - fErrorMessage = SSEUIPlugin.getResourceString("%Java_Content_Assist_is_not_UI_"); //$NON-NLS-1$ = "Java Content Assist is not available for the current cursor location" + fErrorMessage = JSPUIMessages.Java_Content_Assist_is_not_UI_; } return results; } diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java index afe035b99f..2282f93542 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java @@ -22,13 +22,13 @@ import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; import org.eclipse.jst.jsp.core.text.IJSPPartitionTypes; +import org.eclipse.jst.jsp.ui.internal.JSPUIMessages; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionContainer; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.ui.internal.IReleasable; -import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; @@ -45,7 +45,7 @@ public class JSPJavaContentAssistProcessor implements IContentAssistProcessor, I protected IResource fResource; protected char completionProposalAutoActivationCharacters[] = new char[]{'.'}; protected char contextInformationAutoActivationCharacters[] = null; - protected static final String UNKNOWN_CONTEXT = SSEUIPlugin.getResourceString("%Content_Assist_not_availab_UI_"); //$NON-NLS-1$ = "Content Assist not available at the current location " + protected static final String UNKNOWN_CONTEXT = JSPUIMessages.Content_Assist_not_availab_UI_; protected String fErrorMessage = null; private JSPCompletionProcessor fJspCompletionProcessor = null; diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/StructuredTextEditorJSP.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/StructuredTextEditorJSP.java index dfd7289180..3264a4a4a4 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/StructuredTextEditorJSP.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/StructuredTextEditorJSP.java @@ -30,7 +30,6 @@ import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.wst.html.ui.edit.ui.CleanupActionHTML; import org.eclipse.wst.html.ui.internal.search.HTMLFindOccurrencesAction; import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.StructuredTextEditor; import org.eclipse.wst.sse.ui.internal.actions.ActionDefinitionIds; import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants; @@ -47,7 +46,7 @@ public class StructuredTextEditorJSP extends StructuredTextEditor { protected void createActions() { super.createActions(); - ResourceBundle resourceBundle = SSEUIPlugin.getDefault().getResourceBundle(); + ResourceBundle resourceBundle = JSPUIMessages.getResourceBundle(); Action action = new CleanupActionHTML(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_CLEANUP_DOCUMENT + UNDERSCORE, this); action.setActionDefinitionId(ActionDefinitionIds.CLEANUP_DOCUMENT); |