Author: vrubezhny Date: 2007-07-13 12:16:01 -0400 (Fri, 13 Jul 2007) New Revision: 2435 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java Log: http://jira.jboss.org/jira/browse/EXIN-330 Prompting Computer/Processor is added to be used in JSP Editor content assistants Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2007-07-13 16:14:23 UTC (rev 2434) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2007-07-13 16:16:01 UTC (rev 2435) @@ -37,7 +37,8 @@ org.eclipse.jem.util, org.eclipse.emf.ecore, org.eclipse.jst.j2ee.ui, - org.eclipse.jst.j2ee.web + org.eclipse.jst.j2ee.web, + org.eclipse.wst.xml.ui Eclipse-LazyStart: true Export-Package: org.jboss.tools.seam.ui, org.jboss.tools.seam.ui.views, Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-07-13 16:14:23 UTC (rev 2434) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-07-13 16:16:01 UTC (rev 2435) @@ -187,5 +187,24 @@ <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" /> </contentAssistProcessor> </extension> + + <extension + point="org.jboss.tools.common.text.xml.contentAssistProcessor" + id="org.jboss.tools.seam.ui.contentAssistProcessor" + name="org.jboss.tools.seam.ui.contentAssistProcessor"> + + <contentAssistProcessor + class="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor" + id="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor"> + <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" /> + <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" /> + <partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" /> + <partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" /> + <partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" /> + <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" /> + <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> + + </contentAssistProcessor> + </extension> </plugin> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELCompletionEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELCompletionEngine.java 2007-07-13 16:14:23 UTC (rev 2434) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELCompletionEngine.java 2007-07-13 16:16:01 UTC (rev 2435) @@ -58,7 +58,7 @@ List<ELToken> tokens = tokenizer.getTokens(); List<ELToken> resolvedExpressionPart = new ArrayList<ELToken>(); - List<ISeamContextVariable> resolvedVariables = null; + List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>(); ScopeType scope = getScope(project, file); List<List<ELToken>> variations = getPossibleVarsFromPrefix(tokens); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2007-07-13 16:14:23 UTC (rev 2434) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2007-07-13 16:16:01 UTC (rev 2435) @@ -41,6 +41,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.wst.xml.ui.internal.util.SharedXMLEditorPluginImageHelper; import org.jboss.tools.common.text.ext.IEditorWrapper; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; @@ -79,7 +80,7 @@ } public Image getImage() { - return null; + return SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE); } public IContextInformation getContextInformation() {