[562631] Move generic proposal computer into sse.ui

diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentassist/GenericCompletionProposalComputer.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentassist/GenericCompletionProposalComputer.java
index 5857772..96816fc 100755
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentassist/GenericCompletionProposalComputer.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentassist/GenericCompletionProposalComputer.java

@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation

  *******************************************************************************/

 

-package org.eclipse.wst.html.ui.internal.contentassist;

+package org.eclipse.wst.sse.ui.internal.contentassist;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -27,9 +27,9 @@
 import org.eclipse.jface.text.source.ISourceViewer;

 import org.eclipse.ui.internal.genericeditor.ContentAssistProcessorRegistry;

 import org.eclipse.ui.internal.genericeditor.GenericEditorPlugin;

-import org.eclipse.wst.html.ui.internal.Logger;

 import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext;

 import org.eclipse.wst.sse.ui.contentassist.ICompletionProposalComputer;

+import org.eclipse.wst.sse.ui.internal.Logger;

 

 public class GenericCompletionProposalComputer implements ICompletionProposalComputer {

 	List<IContentAssistProcessor> fContentAssistProcessors = null;

@@ -45,7 +45,7 @@
 	}

 

 	@Override

-	public List computeCompletionProposals(CompletionProposalInvocationContext context, IProgressMonitor monitor) {

+	public List<ICompletionProposal> computeCompletionProposals(CompletionProposalInvocationContext context, IProgressMonitor monitor) {

 		ISourceViewer viewer = null;

 		fLastErrorMessage = null;

 		if (context.getViewer() instanceof ISourceViewer) {

@@ -83,7 +83,7 @@
 	}

 

 	@Override

-	public List computeContextInformation(CompletionProposalInvocationContext context, IProgressMonitor monitor) {

+	public List<IContextInformation> computeContextInformation(CompletionProposalInvocationContext context, IProgressMonitor monitor) {

 		ISourceViewer viewer = null;

 		fLastErrorMessage = null;

 		if (context.getViewer() instanceof ISourceViewer) {


diff --git a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index 0bc5f9f..9dd81ef 100755
--- a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true
-Bundle-Version: 1.1.300.qualifier
+Bundle-Version: 1.1.400.qualifier
 Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -35,7 +35,6 @@
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.ui.genericeditor;bundle-version="[1.1.700,1.2.0)";resolution:=optional,
  org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",

diff --git a/web/bundles/org.eclipse.wst.html.ui/plugin.xml b/web/bundles/org.eclipse.wst.html.ui/plugin.xml
index ab0d21d..1763e02 100755
--- a/web/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/web/bundles/org.eclipse.wst.html.ui/plugin.xml

@@ -678,7 +678,7 @@
     <proposalComputer
           activate="false"
           categoryId="org.eclipse.wst.html.ui.proposalCategory.generic"
-          class="org.eclipse.wst.html.ui.internal.contentassist.GenericCompletionProposalComputer"
+          class="org.eclipse.wst.sse.ui.internal.contentassist.GenericCompletionProposalComputer"
           id="org.eclipse.wst.html.ui.proposalComputer.generic">
        <contentType
              id="org.eclipse.wst.html.core.htmlsource">

diff --git a/web/bundles/org.eclipse.wst.html.ui/pom.xml b/web/bundles/org.eclipse.wst.html.ui/pom.xml
index 6c0fb22..c3c1b21 100644
--- a/web/bundles/org.eclipse.wst.html.ui/pom.xml
+++ b/web/bundles/org.eclipse.wst.html.ui/pom.xml

@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.html.ui</artifactId>
-  <version>1.1.300-SNAPSHOT</version>
+  <version>1.1.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>