Author: akazakov
Date: 2009-10-16 07:24:20 -0400 (Fri, 16 Oct 2009)
New Revision: 18126
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4978
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-10-16
10:17:02 UTC (rev 18125)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-10-16
11:24:20 UTC (rev 18126)
@@ -560,7 +560,7 @@
projects.add(project);
IKbProject kbProject = KbProjectFactory.getKbProject(project, false);
if(kbProject!=null) {
- IValidationContext rootContext = null; // kbProject.getValidationContext();
+ IValidationContext rootContext = kbProject.getValidationContext();
return new ValidatingProjectSet(project, projects, rootContext);
}
return null;
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2009-10-16
10:17:02 UTC (rev 18125)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2009-10-16
11:24:20 UTC (rev 18126)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IProjectNature;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.jst.web.kb.validation.IValidationContext;
/**
*
@@ -26,14 +27,19 @@
* Returns all available tag libraries.
* @return
*/
- public ITagLibrary[] getTagLibraries();
+ ITagLibrary[] getTagLibraries();
/**
* Returns tag libraries by URI
* @param uri
* @return
*/
- public ITagLibrary[] getTagLibraries(String uri);
+ ITagLibrary[] getTagLibraries(String uri);
- public void resolve();
+ void resolve();
+
+ /**
+ * @return validation context which is associated with this KB project.
+ */
+ IValidationContext getValidationContext();
}
\ No newline at end of file
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-10-16
10:17:02 UTC (rev 18125)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-10-16
11:24:20 UTC (rev 18126)
@@ -352,12 +352,17 @@
if(f != null && f.isFile()) f.delete();
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IKbProject#getValidationContext()
+ */
public IValidationContext getValidationContext() {
if(validationContext == null) {
validationContext = new ProjectValidationContext();
}
return validationContext;
}
+
/*
*
*/
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-10-16
10:17:02 UTC (rev 18125)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-10-16
11:24:20 UTC (rev 18126)
@@ -1,3 +1,13 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.seam.core;
import org.eclipse.osgi.util.NLS;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-10-16 10:17:02 UTC (rev
18125)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-10-16 11:24:20 UTC (rev
18126)
@@ -345,54 +345,6 @@
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">
- <contenttype id="org.eclipse.jst.jsp.core.jspsource">
- <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" />
- </contenttype>
- <contenttype id="org.eclipse.wst.html.core.htmlsource">
- <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" />
- </contenttype>
- <contenttype id="org.eclipse.core.runtime.xml">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.common.model.ui.xml">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
-
- <contenttype id="org.jboss.tools.seam.xml.ui.pages12xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.page12xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.page20xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.pages21xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.page21xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- </contentAssistProcessor -->
</extension>
<extension