August 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r33745 - in trunk: jsf/plugins/org.jboss.tools.jsf and 10 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-08-09 20:42:25 -0400 (Tue, 09 Aug 2011) New Revision: 33745 Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/schema/elProjectSet.exsd trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELProjectSetExtension.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/IProjectsSet.java Removed: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELReferencesQueryParticipant.java trunk/jsf/plugins/org.jboss.tools.jsf/schemas/elProjectSet.exsd trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ELProjectSetExtension.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ProjectsSet.java Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java Log: https://issues.jboss.org/browse/JBIDE-9473 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -12,12 +12,14 @@ import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; public class DefaultJavaRelevanceCheck implements IRelevanceCheck { String test1 = null; String test2 = null; String test3 = null; + boolean isIType = false; public DefaultJavaRelevanceCheck(IJavaElement element) { if(element == null) return; @@ -31,10 +33,15 @@ test3 = test1.substring(2); } if(test3 != null && test3.equals(test2)) test3 = null; + }else if(element instanceof IType){ + isIType = true; } } public boolean isRelevant(String content) { + if(isIType) + return true; + if(test1 != null && content.contains(test1)) return true; if(test2 != null && content.contains(test2)) return true; if(test3 != null && content.contains(test3)) return true; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-08-10 00:42:25 UTC (rev 33745) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <plugin> - <extension-point id="elProjectSet" name="EL Project Set" schema="schemas/elProjectSet.exsd"/> - <extension point="org.jboss.tools.common.model.meta"> <meta path="meta/jsf.meta"> </meta> Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/schemas/elProjectSet.exsd =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/schemas/elProjectSet.exsd 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jsf/plugins/org.jboss.tools.jsf/schemas/elProjectSet.exsd 2011-08-10 00:42:25 UTC (rev 33745) @@ -1,127 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<schema targetNamespace="org.jboss.tools.common.el.core" xmlns="http://www.w3.org/2001/XMLSchema"> -<annotation> - <appinfo> - <meta.schema plugin="org.jboss.tools.common.el.core" id="elSearch" name="EL Search"/> - </appinfo> - <documentation> - This extenion point is used to send information about seam project to search and rename participants. In order to have one search participand and one rename participant for seam and jsf projects. - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <appinfo> - <meta.element /> - </appinfo> - </annotation> - <complexType> - <sequence> - <element ref="project-set" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute translatable="true"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="project-set"> - <complexType> - <attribute name="id" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute kind="identifier"/> - </appinfo> - </annotation> - </attribute> - <attribute name="projectset-class" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute kind="java" basedOn=":org.jboss.tools.common.el.core.refactoring.ProjectsSet"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appinfo> - <meta.section type="since"/> - </appinfo> - <documentation> - JBoss Tools 3.1 - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="examples"/> - </appinfo> - <documentation> - [Enter extension point usage example here.] - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="apiinfo"/> - </appinfo> - <documentation> - [Enter API information here.] - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="implementation"/> - </appinfo> - <documentation> - [Enter information about supplied implementation of this extension point.] - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="copyright"/> - </appinfo> - <documentation> - Copyright (c) 2009 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 - </documentation> - </annotation> - -</schema> Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ELProjectSetExtension.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ELProjectSetExtension.java 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ELProjectSetExtension.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -1,47 +0,0 @@ -package org.jboss.tools.jsf.el.refactoring; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.Platform; -import org.jboss.tools.common.el.core.ELCorePlugin; - -public class ELProjectSetExtension { - public static String EXTENSION_POINT = "org.jboss.tools.jsf.elProjectSet"; //$NON-NLS-1$ - - String id; - ProjectsSet searcher; - - public ELProjectSetExtension() {} - - public String getId() { - return id; - } - - public ProjectsSet getProjectSet() { - return searcher; - } - - static ELProjectSetExtension[] INSTANCES; - - public static ELProjectSetExtension[] getInstances() { - if(INSTANCES != null) return INSTANCES; - List<ELProjectSetExtension> list = new ArrayList<ELProjectSetExtension>(); - IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT); - IConfigurationElement[] es = point.getConfigurationElements(); - for (IConfigurationElement e: es) { - ELProjectSetExtension n = new ELProjectSetExtension(); - n.id = e.getAttribute("id"); //$NON-NLS-1$ - try{ - n.searcher = (ProjectsSet)e.createExecutableExtension("projectset-class"); //$NON-NLS-1$ - }catch(CoreException ex){ - ELCorePlugin.getDefault().logError(ex); - } - list.add(n); - } - return INSTANCES = list.toArray(new ELProjectSetExtension[0]); - } -} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ProjectsSet.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ProjectsSet.java 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/ProjectsSet.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 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.jsf.el.refactoring; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; - -/** - * - * @author Daniel - * - * This interface is used for transmit information about seam project structure from seam plugins through org.jboss.tools.common.el.core.elSearcher extension point - */ -public interface ProjectsSet { - /** - * inits seam project structure - * @param project - */ - public void init(IProject project); - - /** - * returns all linked seam projects - * @return - */ - public IProject[] getLinkedProjects(); - - /** - * returns view folder (like WEB_CONTENT, EAR_CONTENT) for each seam project - * @param project - * @return - */ - public IContainer getViewFolder(IProject project); -} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2011-08-10 00:42:25 UTC (rev 33745) @@ -415,15 +415,6 @@ </perspectiveExtension> </extension> - <extension - point="org.eclipse.jdt.ui.queryParticipants"> - <queryParticipant - class="org.jboss.tools.jsf.ui.el.refactoring.ELReferencesQueryParticipant" - id="org.jboss.tools.jsf.ui.el.refactoring.ELReferencesQueryParticipant" - name="jsf-SearchELReferencesParticipant" - nature="org.jboss.tools.jsf.jsfnature"> - </queryParticipant> - </extension> <extension point="org.eclipse.ltk.core.refactoring.renameParticipants"> <renameParticipant Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELReferencesQueryParticipant.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELReferencesQueryParticipant.java 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELReferencesQueryParticipant.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 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.jsf.ui.el.refactoring; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.search.IJavaSearchConstants; -import org.eclipse.jdt.ui.search.ElementQuerySpecification; -import org.eclipse.jdt.ui.search.IMatchPresentation; -import org.eclipse.jdt.ui.search.IQueryParticipant; -import org.eclipse.jdt.ui.search.ISearchRequestor; -import org.eclipse.jdt.ui.search.QuerySpecification; -import org.eclipse.search.ui.text.Match; -import org.jboss.tools.common.model.project.ProjectHome; -import org.jboss.tools.jsf.el.refactoring.ELProjectSetExtension; -import org.jboss.tools.jsf.el.refactoring.ProjectsSet; -import org.jboss.tools.jst.web.kb.refactoring.RefactorSearcher; - -public class ELReferencesQueryParticipant implements IQueryParticipant{ - private ELSearcher searcher; - - public int estimateTicks(QuerySpecification specification) { - return 10; - } - - public IMatchPresentation getUIParticipant() { - return null; - } - - public void search(ISearchRequestor requestor, - QuerySpecification querySpecification, IProgressMonitor monitor) - throws CoreException { - - if(querySpecification instanceof ElementQuerySpecification){ - if (!isSearchForReferences(querySpecification.getLimitTo())) - return; - - ElementQuerySpecification qs = (ElementQuerySpecification)querySpecification; - if(qs.getElement() instanceof IMethod || qs.getElement() instanceof IType){ - IFile file = (IFile)qs.getElement().getResource(); - if(file == null) - return; - - String name = qs.getElement().getElementName(); - - searcher = new ELSearcher(requestor, qs.getElement(), file, name); - searcher.setSearchScope(qs.getScope()); - - searcher.findELReferences(); - } - } - } - - public boolean isSearchForReferences(int limitTo) { - int maskedLimitTo = limitTo & ~(IJavaSearchConstants.IGNORE_DECLARING_TYPE+IJavaSearchConstants.IGNORE_RETURN_TYPE); - if (maskedLimitTo == IJavaSearchConstants.REFERENCES || maskedLimitTo == IJavaSearchConstants.ALL_OCCURRENCES) { - return true; - } - - return false; - } - - class ELSearcher extends RefactorSearcher{ - ISearchRequestor requestor; - ProjectsSet projectSet=null; - - public ELSearcher(ISearchRequestor requestor, IJavaElement element, IFile file, String name){ - super(file, name, element); - this.requestor = requestor; - ELProjectSetExtension[] extensions = ELProjectSetExtension.getInstances(); - if(extensions.length > 0){ - projectSet = extensions[0].getProjectSet(); - if(projectSet != null) - projectSet.init(file.getProject()); - } - - } - - protected void outOfSynch(IProject file){ - // do nothing - } - - @Override - protected void match(IFile file, int offset, int length) { - Match match = new Match(file, offset, length); - requestor.reportMatch(match); - } - - protected IProject[] getProjects(){ - if(projectSet != null){ - return projectSet.getLinkedProjects(); - } - return new IProject[]{baseFile.getProject()}; - } - - protected IContainer getViewFolder(IProject project){ - if(projectSet != null){ - return projectSet.getViewFolder(project); - } - - IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject()); - - if(path != null) - return project.getFolder(path.removeFirstSegments(1)); - - return null; - } - } -} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -35,9 +35,9 @@ import org.eclipse.text.edits.TextEdit; import org.jboss.tools.common.model.project.ProjectHome; import org.jboss.tools.common.util.BeanUtil; -import org.jboss.tools.jsf.el.refactoring.ELProjectSetExtension; -import org.jboss.tools.jsf.el.refactoring.ProjectsSet; import org.jboss.tools.jsf.ui.JsfUIMessages; +import org.jboss.tools.jst.web.kb.refactoring.ELProjectSetExtension; +import org.jboss.tools.jst.web.kb.refactoring.IProjectsSet; import org.jboss.tools.jst.web.kb.refactoring.RefactorSearcher; public class RenameMethodParticipant extends RenameParticipant implements ISharableParticipant{ @@ -168,7 +168,7 @@ } class RenameMethodSearcher extends RefactorSearcher{ - ProjectsSet projectSet=null; + IProjectsSet projectSet=null; public RenameMethodSearcher(IFile file, String name){ super(file, name, element); ELProjectSetExtension[] extensions = ELProjectSetExtension.getInstances(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-08-10 00:42:25 UTC (rev 33745) @@ -47,3 +47,4 @@ org.jboss.tools.jst.web.kb.taglib, org.jboss.tools.jst.web.kb.validation Bundle-ClassPath: . +Import-Package: org.eclipse.search.ui.text Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-08-10 00:42:25 UTC (rev 33745) @@ -6,6 +6,7 @@ <extension-point id="validator" name="KB Validator" schema="schema/validator.exsd"/> <extension-point id="elValidationDelegate" name="EL Validation Delegate" schema="schema/elValidationDelegate.exsd"/> <extension-point id="KbRequire" name="KB Builder Requirement" schema="schema/KbRequire.exsd"/> + <extension-point id="elProjectSet" name="EL Project Set" schema="schema/elProjectSet.exsd"/> <extension id="kbbuilder" @@ -383,5 +384,14 @@ </objectContribution> </extension> - + + <extension + point="org.eclipse.jdt.ui.queryParticipants"> + <queryParticipant + class="org.jboss.tools.jst.web.kb.refactoring.ELReferencesQueryParticipant" + id="org.jboss.tools.jst.web.kb.refactoring.ELReferencesQueryParticipant" + name="SearchELReferencesParticipant" + nature="org.eclipse.jdt.core.javanature"> + </queryParticipant> + </extension> </plugin> Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/schema/elProjectSet.exsd =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/schema/elProjectSet.exsd (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/schema/elProjectSet.exsd 2011-08-10 00:42:25 UTC (rev 33745) @@ -0,0 +1,129 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.tools.jst.web.kb" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appInfo> + <meta.schema plugin="org.jboss.tools.jst.web.kb" id="elSearch" name="EL Search"/> + </appInfo> + <documentation> + This extenion point is used to send information about seam project to search and rename participants. In order to have one search participand and one rename participant for seam and jsf projects. + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> + <complexType> + <sequence> + <element ref="project-set" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="project-set"> + <complexType> + <attribute name="id" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="identifier"/> + </appInfo> + </annotation> + </attribute> + <attribute name="projectset-class" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.jboss.tools.common.el.core.refactoring.ProjectsSet"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + JBoss Tools 3.3 + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + <extension point="org.jboss.tools.jst.web.kb.elProjectSet"> + <project-set id="seam.searcher" projectset-class="org.jboss.tools.seam.internal.core.refactoring.ELProjectSet" /> +</extension> + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiinfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="copyright"/> + </appInfo> + <documentation> + Copyright (c) 2009 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 + </documentation> + </annotation> + +</schema> Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/schema/elProjectSet.exsd ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELProjectSetExtension.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELProjectSetExtension.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELProjectSetExtension.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -0,0 +1,47 @@ +package org.jboss.tools.jst.web.kb.refactoring; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.common.el.core.ELCorePlugin; + +public class ELProjectSetExtension { + public static String EXTENSION_POINT = "org.jboss.tools.jst.web.kb.elProjectSet"; //$NON-NLS-1$ + + String id; + IProjectsSet searcher; + + public ELProjectSetExtension() {} + + public String getId() { + return id; + } + + public IProjectsSet getProjectSet() { + return searcher; + } + + static ELProjectSetExtension[] INSTANCES; + + public static ELProjectSetExtension[] getInstances() { + if(INSTANCES != null) return INSTANCES; + List<ELProjectSetExtension> list = new ArrayList<ELProjectSetExtension>(); + IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT); + IConfigurationElement[] es = point.getConfigurationElements(); + for (IConfigurationElement e: es) { + ELProjectSetExtension n = new ELProjectSetExtension(); + n.id = e.getAttribute("id"); //$NON-NLS-1$ + try{ + n.searcher = (IProjectsSet)e.createExecutableExtension("projectset-class"); //$NON-NLS-1$ + }catch(CoreException ex){ + ELCorePlugin.getDefault().logError(ex); + } + list.add(n); + } + return INSTANCES = list.toArray(new ELProjectSetExtension[0]); + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELProjectSetExtension.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -0,0 +1,124 @@ +/******************************************************************************* + * Copyright (c) 2009 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.jst.web.kb.refactoring; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.search.IJavaSearchConstants; +import org.eclipse.jdt.ui.search.ElementQuerySpecification; +import org.eclipse.jdt.ui.search.IMatchPresentation; +import org.eclipse.jdt.ui.search.IQueryParticipant; +import org.eclipse.jdt.ui.search.ISearchRequestor; +import org.eclipse.jdt.ui.search.QuerySpecification; +import org.eclipse.search.ui.text.Match; +import org.jboss.tools.common.model.project.ProjectHome; +import org.jboss.tools.jst.web.kb.refactoring.ELProjectSetExtension; +import org.jboss.tools.jst.web.kb.refactoring.IProjectsSet; +import org.jboss.tools.jst.web.kb.refactoring.RefactorSearcher; + +public class ELReferencesQueryParticipant implements IQueryParticipant{ + private ELSearcher searcher; + + public int estimateTicks(QuerySpecification specification) { + return 10; + } + + public IMatchPresentation getUIParticipant() { + return null; + } + + public void search(ISearchRequestor requestor, + QuerySpecification querySpecification, IProgressMonitor monitor) + throws CoreException { + + if(querySpecification instanceof ElementQuerySpecification){ + if (!isSearchForReferences(querySpecification.getLimitTo())) + return; + + ElementQuerySpecification qs = (ElementQuerySpecification)querySpecification; + if(qs.getElement() instanceof IMethod || qs.getElement() instanceof IType){ + IFile file = (IFile)qs.getElement().getResource(); + if(file == null) + return; + + String name = qs.getElement().getElementName(); + + searcher = new ELSearcher(requestor, qs.getElement(), file, name); + searcher.setSearchScope(qs.getScope()); + + searcher.findELReferences(); + } + } + } + + public boolean isSearchForReferences(int limitTo) { + int maskedLimitTo = limitTo & ~(IJavaSearchConstants.IGNORE_DECLARING_TYPE+IJavaSearchConstants.IGNORE_RETURN_TYPE); + if (maskedLimitTo == IJavaSearchConstants.REFERENCES || maskedLimitTo == IJavaSearchConstants.ALL_OCCURRENCES) { + return true; + } + + return false; + } + + class ELSearcher extends RefactorSearcher{ + ISearchRequestor requestor; + IProjectsSet projectSet=null; + + public ELSearcher(ISearchRequestor requestor, IJavaElement element, IFile file, String name){ + super(file, name, element); + this.requestor = requestor; + ELProjectSetExtension[] extensions = ELProjectSetExtension.getInstances(); + if(extensions.length > 0){ + projectSet = extensions[0].getProjectSet(); + if(projectSet != null) + projectSet.init(file.getProject()); + } + + } + + protected void outOfSynch(IProject file){ + // do nothing + } + + @Override + protected void match(IFile file, int offset, int length) { + Match match = new Match(file, offset, length); + requestor.reportMatch(match); + } + + protected IProject[] getProjects(){ + if(projectSet != null){ + return projectSet.getLinkedProjects(); + } + return new IProject[]{baseFile.getProject()}; + } + + protected IContainer getViewFolder(IProject project){ + if(projectSet != null){ + return projectSet.getViewFolder(project); + } + + IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject()); + + if(path != null) + return project.getFolder(path.removeFirstSegments(1)); + + return null; + } + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/IProjectsSet.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/IProjectsSet.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/IProjectsSet.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2009 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.jst.web.kb.refactoring; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IProject; + +/** + * + * @author Daniel + * + * This interface is used for transmit information about seam project structure from seam plugins through org.jboss.tools.common.el.core.elSearcher extension point + */ +public interface IProjectsSet { + /** + * inits seam project structure + * @param project + */ + public void init(IProject project); + + /** + * returns all linked seam projects + * @return + */ + public IProject[] getLinkedProjects(); + + /** + * returns view folder (like WEB_CONTENT, EAR_CONTENT) for each seam project + * @param project + * @return + */ + public IContainer getViewFolder(IProject project); +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/IProjectsSet.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.jst.web.kb.refactoring; -import java.io.InputStream; import java.util.List; import java.util.StringTokenizer; @@ -46,7 +45,6 @@ import org.jboss.tools.common.util.BeanUtil; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jst.web.kb.PageContextFactory; -import org.jboss.tools.jst.web.kb.WebKbPlugin; public abstract class RefactorSearcher { protected static final String JAVA_EXT = "java"; //$NON-NLS-1$ @@ -243,24 +241,6 @@ protected void searchInCach(IFile file){ if(file == null) return; ELResolver[] resolvers = ELResolverFactoryManager.getInstance().getResolvers(file); - IRelevanceCheck[] checks = getRelevanceChecks(resolvers); - String text = null; - try { - InputStream is = file.getContents(); - if(is != null) text = FileUtil.readStream(is); - } catch (CoreException e) { - WebKbPlugin.getDefault().logError(e); - } - if(text != null) { - boolean found = false; - for (IRelevanceCheck check: checks) { - if(check != null && check.isRelevant(text)) { - found = true; - break; - } - } - if(!found) return; - } ELContext context = PageContextFactory.createPageContext(file); @@ -269,7 +249,7 @@ ELReference[] references = context.getELReferences(); resolvers = context.getElResolvers(); - checks = getRelevanceChecks(resolvers); + IRelevanceCheck[] checks = getRelevanceChecks(resolvers); if(javaElement != null){ for(ELReference reference : references){ @@ -323,25 +303,6 @@ return checks; } - // looking for component references in EL -// private void scanString(IFile file, String string, int offset) { -// int startEl = string.indexOf("#{"); //$NON-NLS-1$ -// if(startEl<0) -// startEl = string.indexOf("${"); //$NON-NLS-1$ -// if(startEl>-1) { -// ELParser parser = ELParserUtil.getJbossFactory().createParser(); -// ELModel model = parser.parse(string); -// for (ELInstance instance : model.getInstances()) { -// for(ELInvocationExpression ie : instance.getExpression().getInvocations()){ -// ELInvocationExpression expression = findComponentReference(ie); -// if(expression != null){ -// checkMatch(file, expression, offset+getOffset(expression), getLength(expression)); -// } -// } -// } -// } -// } - protected int getOffset(ELInvocationExpression expression){ if(expression instanceof ELPropertyInvocation){ ELPropertyInvocation pi = (ELPropertyInvocation)expression; @@ -373,8 +334,6 @@ } private void scanProperties(IFile file, String content){ - //scanString(file, content, 0); - if(!file.getName().equals(SEAM_PROPERTIES_FILE)) return; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2011-08-10 00:42:25 UTC (rev 33745) @@ -506,7 +506,7 @@ </extension> <extension - point="org.jboss.tools.jsf.elProjectSet"> + point="org.jboss.tools.jst.web.kb.elProjectSet"> <project-set id="seam.searcher" projectset-class="org.jboss.tools.seam.internal.core.refactoring.ELProjectSet" /> </extension> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java 2011-08-10 00:01:27 UTC (rev 33744) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java 2011-08-10 00:42:25 UTC (rev 33745) @@ -14,10 +14,10 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.jboss.tools.common.model.project.ProjectHome; -import org.jboss.tools.jsf.el.refactoring.ProjectsSet; +import org.jboss.tools.jst.web.kb.refactoring.IProjectsSet; import org.jboss.tools.seam.core.SeamProjectsSet; -public class ELProjectSet implements ProjectsSet { +public class ELProjectSet implements IProjectsSet { SeamProjectsSet projectsSet; IProject project;

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33744 - in trunk/jsf/docs/userguide/en-US: images/visual_page and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-08-09 20:01:27 -0400 (Tue, 09 Aug 2011) New Revision: 33744 Modified: trunk/jsf/docs/userguide/en-US/editors.xml trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_23a.png trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_23b.png Log: updated for TOOLSDOC-182 Modified: trunk/jsf/docs/userguide/en-US/editors.xml =================================================================== --- trunk/jsf/docs/userguide/en-US/editors.xml 2011-08-10 00:01:11 UTC (rev 33743) +++ trunk/jsf/docs/userguide/en-US/editors.xml 2011-08-10 00:01:27 UTC (rev 33744) @@ -1383,7 +1383,7 @@ </figure> <para> - You can insert a tag or component from the palette into either the <guilabel>Source</guilabel> or the <guilabel>Visual</guilabel> part by displaying the context menu and selecting <guimenuitem>Insert around</guimenuitem>, <guimenuitem>Insert before</guimenuitem>, <guimenuitem>Insert after</guimenuitem> or <guimenuitem>Replace With</guimenuitem>, pointing to <guimenuitem>From Palette</guimenuitem>, picking the type of the tag and finally choosing the tag you want to insert. + You can insert a tag or component from the palette into either the <guilabel>Source</guilabel> or the <guilabel>Visual</guilabel> part by displaying the context menu and selecting <guimenuitem>Insert around</guimenuitem>, <guimenuitem>Insert before</guimenuitem>, <guimenuitem>Insert after</guimenuitem> or <guimenuitem>Replace With</guimenuitem>, picking the type of the tag and finally choosing the tag you want to insert. </para> <para> Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_23a.png =================================================================== (Binary files differ) Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_23b.png =================================================================== (Binary files differ)

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33743 - in branches/jbosstools-3.2.x/jsf/docs/userguide/en-US: images/visual_page and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-08-09 20:01:11 -0400 (Tue, 09 Aug 2011) New Revision: 33743 Modified: branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/editors.xml branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/images/visual_page/visual_page_23a.png branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/images/visual_page/visual_page_23b.png Log: updated for TOOLSDOC-182 Modified: branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/editors.xml =================================================================== --- branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/editors.xml 2011-08-09 22:27:43 UTC (rev 33742) +++ branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/editors.xml 2011-08-10 00:01:11 UTC (rev 33743) @@ -1383,7 +1383,7 @@ </figure> <para> - You can insert a tag or component from the palette into either the <guilabel>Source</guilabel> or the <guilabel>Visual</guilabel> part by displaying the context menu and selecting <guimenuitem>Insert around</guimenuitem>, <guimenuitem>Insert before</guimenuitem>, <guimenuitem>Insert after</guimenuitem> or <guimenuitem>Replace With</guimenuitem>, pointing to <guimenuitem>From Palette</guimenuitem>, picking the type of the tag and finally choosing the tag you want to insert. + You can insert a tag or component from the palette into either the <guilabel>Source</guilabel> or the <guilabel>Visual</guilabel> part by displaying the context menu and selecting <guimenuitem>Insert around</guimenuitem>, <guimenuitem>Insert before</guimenuitem>, <guimenuitem>Insert after</guimenuitem> or <guimenuitem>Replace With</guimenuitem>, picking the type of the tag and finally choosing the tag you want to insert. </para> <para> Modified: branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/images/visual_page/visual_page_23a.png =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/images/visual_page/visual_page_23b.png =================================================================== (Binary files differ)

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33742 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-08-09 18:27:43 -0400 (Tue, 09 Aug 2011) New Revision: 33742 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java Log: JBIDE-9503 https://issues.jboss.org/browse/JBIDE-9503 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2011-08-09 22:23:52 UTC (rev 33741) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2011-08-09 22:27:43 UTC (rev 33742) @@ -25,6 +25,7 @@ import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; +import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.outline.ValueHelper; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; @@ -194,7 +195,7 @@ } }; - JspContentAssistProcessor processor = valueHelper.createContentAssistProcessor(); + JspELCompletionProposalComputer processor = valueHelper.createContentAssistProcessor(); int offset = 0; if(sourceNode instanceof IndexedRegion) { offset = ((IndexedRegion)sourceNode).getStartOffset() + 1; @@ -292,7 +293,7 @@ // } // } - protected KbQuery createKbQuery(JspContentAssistProcessor processor, Node fNode, int offset, String attrName) { + protected KbQuery createKbQuery(JspELCompletionProposalComputer processor, Node fNode, int offset, String attrName) { KbQuery kbQuery = new KbQuery(); String[] parentTags = processor.getParentTags(false);

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33741 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: contentassist/computers and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-08-09 18:23:52 -0400 (Tue, 09 Aug 2011) New Revision: 33741 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java Log: JBIDE-9501 https://issues.jboss.org/browse/JBIDE-9501 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2011-08-09 22:17:07 UTC (rev 33740) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2011-08-09 22:23:52 UTC (rev 33741) @@ -20,7 +20,6 @@ import org.eclipse.jface.fieldassist.IContentProposalProvider; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsp.ui.internal.contentassist.JSPContentAssistProcessor; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal; @@ -37,6 +36,7 @@ import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor.TextRegion; +import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.messages.JstUIMessages; import org.jboss.tools.jst.jsp.outline.ValueHelper; @@ -61,7 +61,7 @@ String attributeName; String nodeName; int offset = 0; - JspContentAssistProcessor processor; + JspELCompletionProposalComputer processor; IPageContext pageContext = null; public JSPDialogContentProposalProvider() { @@ -86,7 +86,7 @@ valueHelper = new ValueHelper(); } pageContext = (IPageContext)context.get("pageContext"); //$NON-NLS-1$ - processor = (JspContentAssistProcessor)context.get("processor"); //$NON-NLS-1$ + processor = (JspELCompletionProposalComputer)context.get("processor"); //$NON-NLS-1$ if(processor == null) { processor = valueHelper.createContentAssistProcessor(); context.put("processor", processor); //$NON-NLS-1$ @@ -336,7 +336,7 @@ return i < 0 ? null : nodeName.substring(0, i); } - protected String[] getParentTags(JspContentAssistProcessor processor) { + protected String[] getParentTags(JspELCompletionProposalComputer processor) { String[] result = processor.getParentTags(true); String[] result1 = add(result, attributeName); return result1; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2011-08-09 22:17:07 UTC (rev 33740) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2011-08-09 22:23:52 UTC (rev 33741) @@ -86,7 +86,9 @@ //compute the completion proposals return super.computeCompletionProposals(context, monitor); } finally { - fCurrentContext = null; + if(!keepState) { + fCurrentContext = null; + } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-08-09 22:17:07 UTC (rev 33740) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-08-09 22:23:52 UTC (rev 33741) @@ -79,6 +79,19 @@ private static final String[] EMPTY_TAGS = new String[0]; protected static final Image JSF_EL_PROPOSAL_IMAGE = JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH); + /** + * Implementation may only set fCurrentContext to null if keepState is not set to true. + */ + boolean keepState = false; + + /** + * + * @param b + */ + public void setKeepState(boolean b) { + keepState = b; + } + @Override protected XMLContentModelGenerator getContentGenerator() { return new XMLContentModelGenerator(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2011-08-09 22:17:07 UTC (rev 33740) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2011-08-09 22:23:52 UTC (rev 33741) @@ -122,7 +122,7 @@ import org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration; import org.jboss.tools.jst.jsp.JSPTextViewerConfiguration; import org.jboss.tools.jst.jsp.JspEditorPlugin; -import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; +import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.jst.jsp.editor.IVisualContext; @@ -788,7 +788,7 @@ class AttributeDescriptorValueProviderImpl implements AttributeDescriptorValueProvider { TagProposal proposal; KbQuery query; - JspContentAssistProcessor processor; + JspELCompletionProposalComputer processor; IPageContext pageContext; public void setProposal(ITagProposal proposal) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2011-08-09 22:17:07 UTC (rev 33740) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2011-08-09 22:23:52 UTC (rev 33741) @@ -45,6 +45,7 @@ import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; +import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IViewerDropAdapterFactory; import org.jboss.tools.jst.web.kb.IPageContext; @@ -174,7 +175,7 @@ } else { List modelQueryActionList = new ArrayList(); - JspContentAssistProcessor processor = valueHelper.createContentAssistProcessor(); + JspELCompletionProposalComputer processor = valueHelper.createContentAssistProcessor(); int offset = 0; if(element instanceof IndexedRegion) { offset = ((IndexedRegion)element).getStartOffset() + 1; @@ -222,7 +223,7 @@ }; } - protected KbQuery createKbQuery(JspContentAssistProcessor processor, Node fNode, int offset) { + protected KbQuery createKbQuery(JspELCompletionProposalComputer processor, Node fNode, int offset) { KbQuery kbQuery = new KbQuery(); String[] parentTags = processor.getParentTags(false); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2011-08-09 22:17:07 UTC (rev 33740) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2011-08-09 22:23:52 UTC (rev 33741) @@ -19,6 +19,7 @@ import java.util.Set; import java.util.Stack; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.text.ITextViewer; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.views.properties.IPropertyDescriptor; @@ -28,6 +29,7 @@ import org.eclipse.ui.views.properties.TextPropertyDescriptor; import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; +import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; import org.eclipse.wst.sse.ui.views.properties.IPropertySourceExtension; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; @@ -43,6 +45,8 @@ import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor; import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; +import org.jboss.tools.jst.jsp.contentassist.computers.FaceletsELCompletionProposalComputer; +import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.editor.IVisualController; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.web.kb.IPageContext; @@ -91,7 +95,7 @@ private IPropertyDescriptor[] fDescriptors = null; private ValueHelper valueHelper = new ValueHelper(); IPageContext pageContext; - JspContentAssistProcessor processor; + JspELCompletionProposalComputer processor; int offset = 0; KbQuery kbQuery, kbQueryAttr; @SuppressWarnings("unchecked") @@ -122,8 +126,10 @@ } if(fNode instanceof Node) { - processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor(); - processor.createContext(getTextViewer(), offset); + processor = valueHelper.isFacetets() ? new FaceletsELCompletionProposalComputer() : new JspELCompletionProposalComputer(); +// processor.createContext(getTextViewer(), offset); + processor.setKeepState(true); + processor.computeCompletionProposals(new CompletionProposalInvocationContext(getTextViewer(), offset), new NullProgressMonitor()); pageContext = processor.getContext(); kbQuery = createKbQuery(processor); kbQuery.setMask(true); @@ -293,7 +299,7 @@ return descriptors; } - protected KbQuery createKbQuery(JspContentAssistProcessor processor) { + protected KbQuery createKbQuery(JspELCompletionProposalComputer processor) { KbQuery kbQuery = new KbQuery(); String[] parentTags = processor.getParentTags(false); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2011-08-09 22:17:07 UTC (rev 33740) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2011-08-09 22:23:52 UTC (rev 33741) @@ -20,6 +20,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.source.ISourceViewer; @@ -28,11 +29,13 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; import org.jboss.tools.common.model.project.IPromptingProvider; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.util.ModelFeatureFactory; -import org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor; import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; +import org.jboss.tools.jst.jsp.contentassist.computers.FaceletsELCompletionProposalComputer; +import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.drop.treeviewer.model.AttributeValueResource; import org.jboss.tools.jst.jsp.drop.treeviewer.model.AttributeValueResourceFactory; import org.jboss.tools.jst.jsp.drop.treeviewer.model.ModelElement; @@ -113,14 +116,16 @@ return (jspEditor == null) ? null : jspEditor.getPageContext(); } - public JspContentAssistProcessor createContentAssistProcessor() { - return isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor(); + public JspELCompletionProposalComputer createContentAssistProcessor() { + return isFacetets() ? new FaceletsELCompletionProposalComputer() : new JspELCompletionProposalComputer(); } - public IPageContext createPageContext(JspContentAssistProcessor processor, int offset) { + public IPageContext createPageContext(JspELCompletionProposalComputer processor, int offset) { ISourceViewer sv = getSourceViewer(); if(sv == null) return null; - processor.createContext(sv, offset); +// processor.createContext(sv, offset); + processor.setKeepState(true); + processor.computeCompletionProposals(new CompletionProposalInvocationContext(sv, offset), new NullProgressMonitor()); return processor.getContext(); }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33740 - branches/jbosstools-3.2.x/seam/docs/reference/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-08-09 18:17:07 -0400 (Tue, 09 Aug 2011) New Revision: 33740 Modified: branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_editors.xml Log: updated for TOOLSDOC-239 Modified: branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml =================================================================== --- branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml 2011-08-09 22:16:52 UTC (rev 33739) +++ branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml 2011-08-09 22:17:07 UTC (rev 33740) @@ -7,7 +7,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>4.1</productnumber> <edition>4.1.0</edition> - <pubsnumber>1</pubsnumber> + <pubsnumber>2</pubsnumber> <abstract> <para>The Seam Developer Tools Reference Guide explains how to use the Seam Developer Tools module to create Seam projects for deployment.</para> </abstract> Modified: branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_editors.xml =================================================================== --- branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_editors.xml 2011-08-09 22:16:52 UTC (rev 33739) +++ branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_editors.xml 2011-08-09 22:17:07 UTC (rev 33740) @@ -18,11 +18,11 @@ <section> <title>Visual Page Editor</title> <para> - Visual Page Editor fits perfectly for authoring view Seam pages. The major features of VPE are listed in <xref linkend="SeamEditors"/> + Visual Page Editor is a great tool to use for the authoring of Seam pages. The major features of VPE are listed in <xref linkend="SeamEditors"/> </para> <para> - You can also read more about Visual Page Editor in <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jsf/html/editors.htm...">Visual Page Editor</ulink> chapter of "Visual Web Tools Reference Guide". + You can also read more about Visual Page Editor in the Visual Web Tools Reference Guide. </para> </section> @@ -563,20 +563,20 @@ </para> <itemizedlist> + <listitem> + <para> + <xref linkend="xhtmlFiles"/> + </para> + </listitem> + <listitem> <para> - <xref linkend="xmlFiles"/> + <xref linkend="xmlFiles"/> </para> </listitem> <listitem> <para> - <xref linkend="xhtmlFiles"/> - </para> - </listitem> - - <listitem> - <para> <xref linkend="javaFiles"/> </para> </listitem> @@ -588,14 +588,13 @@ In this section were described only use cases special for Seam applications.For general information please read <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jsf/html/editors.htm...">OpenOn section in Visual Web Tools Reference Guide</ulink>. </para> </note> - + <formalpara id="xhtmlFiles"> + <title>OpenOn in XHTML files</title> + <para> + Using OpenOn in .xhtml files you can open: + </para> + </formalpara> <itemizedlist> - <listitem id="xhtmlFiles"> - <para> - Using OpenOn in .xhtml files you can open: - </para> - - <itemizedlist> <listitem> <para> components or properties resolved using an EL expression; @@ -620,13 +619,13 @@ </para> </listitem> </itemizedlist> - </listitem> - - <listitem id="xmlFiles"> - <para> - OpenOn is also supported in Page Descriptors (<property>.page.xml</property> and <property>pages.xml</property>). OpenOn allows you to navigate to Java beans as well as to view pages. You can <property>Ctrl + left click</property> on a bean or on view page file (e.g. XTML file) to navigate to the file you clicked on. - </para> - + + <formalpara id="xmlFiles"> + <title>OpenOn in XML files</title> + <para> + OpenOn is also supported in Page Descriptors (<property>.page.xml</property> and <property>pages.xml</property>). OpenOn allows you to navigate to Java beans as well as to view pages. You can <property>Ctrl + left click</property> on a bean or on view page file (e.g. XTML file) to navigate to the file you clicked on. + </para> + </formalpara> <figure> <title>OpenOn in .page.xml file</title> <mediaobject> @@ -684,13 +683,13 @@ </figure> </listitem> </itemizedlist> - </listitem> - - <listitem id="javaFiles"> - <para> - OpenOn is also supported in seam components where <property> In annotation</property> is presented. After pressing <property>Ctrl + left click</property> on the seam component specified in <code>@In </code> you will get the possibility to open the file where the component is declarated as well as all of the seam components where it is used in the next declarations: - </para> - + + <formalpara id="javaFiles"> + <title>OpenOn in Java files</title> + <para> + OpenOn is also supported in seam components where <property> In annotation</property> is presented. After pressing <property>Ctrl + left click</property> on the seam component specified in <code>@In </code> you will get the possibility to open the file where the component is declarated as well as all of the seam components where it is used in the next declarations: + </para> + </formalpara> <itemizedlist> <listitem> <para> @@ -725,8 +724,6 @@ </imageobject> </mediaobject> </figure> - </listitem> - </itemizedlist> </section> <section id="SeamValidation">

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33739 - trunk/seam/docs/reference/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-08-09 18:16:52 -0400 (Tue, 09 Aug 2011) New Revision: 33739 Modified: trunk/seam/docs/reference/en-US/Book_Info.xml trunk/seam/docs/reference/en-US/seam_editors.xml Log: updated for TOOLSDOC-239 Modified: trunk/seam/docs/reference/en-US/Book_Info.xml =================================================================== --- trunk/seam/docs/reference/en-US/Book_Info.xml 2011-08-09 21:52:34 UTC (rev 33738) +++ trunk/seam/docs/reference/en-US/Book_Info.xml 2011-08-09 22:16:52 UTC (rev 33739) @@ -7,7 +7,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>4.1</productnumber> <edition>4.1.0</edition> - <pubsnumber>1</pubsnumber> + <pubsnumber>2</pubsnumber> <abstract> <para>The Seam Developer Tools Reference Guide explains how to use the Seam Developer Tools module to create Seam projects for deployment.</para> </abstract> Modified: trunk/seam/docs/reference/en-US/seam_editors.xml =================================================================== --- trunk/seam/docs/reference/en-US/seam_editors.xml 2011-08-09 21:52:34 UTC (rev 33738) +++ trunk/seam/docs/reference/en-US/seam_editors.xml 2011-08-09 22:16:52 UTC (rev 33739) @@ -18,11 +18,11 @@ <section> <title>Visual Page Editor</title> <para> - Visual Page Editor fits perfectly for authoring view Seam pages. The major features of VPE are listed in <xref linkend="SeamEditors"/> + Visual Page Editor is a great tool to use for the authoring of Seam pages. The major features of VPE are listed in <xref linkend="SeamEditors"/> </para> <para> - You can also read more about Visual Page Editor in <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jsf/html/editors.htm...">Visual Page Editor</ulink> chapter of "Visual Web Tools Reference Guide". + You can also read more about Visual Page Editor in the Visual Web Tools Reference Guide. </para> </section> @@ -563,20 +563,20 @@ </para> <itemizedlist> + <listitem> + <para> + <xref linkend="xhtmlFiles"/> + </para> + </listitem> + <listitem> <para> - <xref linkend="xmlFiles"/> + <xref linkend="xmlFiles"/> </para> </listitem> <listitem> <para> - <xref linkend="xhtmlFiles"/> - </para> - </listitem> - - <listitem> - <para> <xref linkend="javaFiles"/> </para> </listitem> @@ -588,14 +588,13 @@ In this section were described only use cases special for Seam applications.For general information please read <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jsf/html/editors.htm...">OpenOn section in Visual Web Tools Reference Guide</ulink>. </para> </note> - + <formalpara id="xhtmlFiles"> + <title>OpenOn in XHTML files</title> + <para> + Using OpenOn in .xhtml files you can open: + </para> + </formalpara> <itemizedlist> - <listitem id="xhtmlFiles"> - <para> - Using OpenOn in .xhtml files you can open: - </para> - - <itemizedlist> <listitem> <para> components or properties resolved using an EL expression; @@ -620,13 +619,13 @@ </para> </listitem> </itemizedlist> - </listitem> - - <listitem id="xmlFiles"> - <para> - OpenOn is also supported in Page Descriptors (<property>.page.xml</property> and <property>pages.xml</property>). OpenOn allows you to navigate to Java beans as well as to view pages. You can <property>Ctrl + left click</property> on a bean or on view page file (e.g. XTML file) to navigate to the file you clicked on. - </para> - + + <formalpara id="xmlFiles"> + <title>OpenOn in XML files</title> + <para> + OpenOn is also supported in Page Descriptors (<property>.page.xml</property> and <property>pages.xml</property>). OpenOn allows you to navigate to Java beans as well as to view pages. You can <property>Ctrl + left click</property> on a bean or on view page file (e.g. XTML file) to navigate to the file you clicked on. + </para> + </formalpara> <figure> <title>OpenOn in .page.xml file</title> <mediaobject> @@ -684,13 +683,13 @@ </figure> </listitem> </itemizedlist> - </listitem> - - <listitem id="javaFiles"> - <para> - OpenOn is also supported in seam components where <property> In annotation</property> is presented. After pressing <property>Ctrl + left click</property> on the seam component specified in <code>@In </code> you will get the possibility to open the file where the component is declarated as well as all of the seam components where it is used in the next declarations: - </para> - + + <formalpara id="javaFiles"> + <title>OpenOn in Java files</title> + <para> + OpenOn is also supported in seam components where <property> In annotation</property> is presented. After pressing <property>Ctrl + left click</property> on the seam component specified in <code>@In </code> you will get the possibility to open the file where the component is declarated as well as all of the seam components where it is used in the next declarations: + </para> + </formalpara> <itemizedlist> <listitem> <para> @@ -725,8 +724,6 @@ </imageobject> </mediaobject> </figure> - </listitem> - </itemizedlist> </section> <section id="SeamValidation">

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33738 - trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-08-09 17:52:34 -0400 (Tue, 09 Aug 2011) New Revision: 33738 Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF Log: JBIDE-9504 : bump m2e version range Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-08-09 20:44:40 UTC (rev 33737) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-08-09 21:52:34 UTC (rev 33738) @@ -11,8 +11,8 @@ org.eclipse.jdt.launching, org.eclipse.ui.editors, org.eclipse.ui.ide, - org.eclipse.m2e.core;bundle-version="[0.13.0,1.0.100)", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,1.0.100)", + org.eclipse.m2e.core;bundle-version="[1.0,2.0)", + org.eclipse.m2e.maven.runtime;bundle-version="[1.0,2.0)", org.eclipse.jdt.core, org.eclipse.ui.views, org.jboss.tools.forge.core;bundle-version="1.0.0"

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33737 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDIDependentSolderTest and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-08-09 16:44:40 -0400 (Tue, 09 Aug 2011) New Revision: 33737 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.project trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/bin/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Town2.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java Log: JBIDE-9484 https://issues.jboss.org/browse/JBIDE-9484 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath 2011-08-09 20:44:40 UTC (rev 33737) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="/CDISolderTest/lib/cdi-api.jar"/> + <classpathentry kind="lib" path="/CDISolderTest/lib/javax.inject.jar"/> + <classpathentry kind="lib" path="/CDISolderTest/lib/seam-solder.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/CDISolderTest"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.project 2011-08-09 20:44:40 UTC (rev 33737) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDIDependentSolderTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> + </natures> +</projectDescription> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.settings/org.eclipse.jdt.core.prefs 2011-08-09 20:44:40 UTC (rev 33737) @@ -0,0 +1,12 @@ +#Tue Aug 09 10:58:56 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Town2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Town2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Town2.java 2011-08-09 20:44:40 UTC (rev 33737) @@ -0,0 +1,26 @@ +package org.jboss.defaultbean; + +import javax.inject.Inject; + +public class Town2 { + + @Inject + @Small + Home small; + + @Inject + @Big + Home big; + + @Inject + @Huge + Home huge; + + @Inject + @Cozy + Home cozy; + + @Inject + Home ruins; + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/src/org/jboss/defaultbean/Town2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java 2011-08-09 20:44:15 UTC (rev 33736) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/DefaultBeanTest.java 2011-08-09 20:44:40 UTC (rev 33737) @@ -36,10 +36,27 @@ public void testDefaultBeanTest() throws CoreException { ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true); - + doTestDefaultBeanInDependentProject(cdi, "src/org/jboss/defaultbean/Town.java"); + } + + public void testDefaultBeanInDependentProject() throws CoreException { + ICDIProject dependent = getDependentCDIProject(); + doTestDefaultBeanInDependentProject(dependent, "src/org/jboss/defaultbean/Town2.java"); + } + + /** + * Checks default bean injection resolution. + * If dependent == cdi, executes check of one project, otherwise looks for beans in + * dependent project. + * + * @param cdi - project where injection points and beans are defined + * @param dependent - dependent project, in which beans are looked for; can be equal to cdi + * @throws CoreException + */ + public void doTestDefaultBeanInDependentProject(ICDIProject cdi, String javaPath) throws CoreException { // 1. For injection point with qualifier @Small, the only eligible bean is // default class bean with qualifier @Small - IInjectionPointField injection = getInjectionPointField(cdi, "src/org/jboss/defaultbean/Town.java", "small"); + IInjectionPointField injection = getInjectionPointField(cdi, javaPath, "small"); Set<IBean> bs = cdi.getBeans(false, injection); assertEquals(1, bs.size()); @@ -54,7 +71,7 @@ // 2. For injection point with qualifier @Big, the only eligible bean is // default producer bean method with qualifier @Big - injection = getInjectionPointField(cdi, "src/org/jboss/defaultbean/Town.java", "big"); + injection = getInjectionPointField(cdi, javaPath, "big"); bs = cdi.getBeans(false, injection); assertEquals(1, bs.size()); @@ -71,7 +88,7 @@ // a) Default producer method bean with qualifier @Huge, // b) one more bean with qualifier @Huge // default bean is filtered out at resolving beans. - injection = getInjectionPointField(cdi, "src/org/jboss/defaultbean/Town.java", "huge"); + injection = getInjectionPointField(cdi, javaPath, "huge"); bs = cdi.getBeans(false, injection); assertEquals(2, bs.size()); @@ -92,7 +109,7 @@ // a) Default producer field bean has qualifier @Cozy, producer inherits @DefaultBean from parent class; // b) One more bean with qualifier @Cozy. // default bean is filtered out at resolving beans. - injection = getInjectionPointField(cdi, "src/org/jboss/defaultbean/Town.java", "cozy"); + injection = getInjectionPointField(cdi, javaPath, "cozy"); bs = cdi.getBeans(false, injection); assertEquals(2, bs.size()); @@ -113,7 +130,7 @@ // a) Default producer field bean without qualifier, producer inherits @DefaultBean from parent class; // b) One more bean without qualifier. // default bean is filtered out at resolving beans. - injection = getInjectionPointField(cdi, "src/org/jboss/defaultbean/Town.java", "ruins"); + injection = getInjectionPointField(cdi, javaPath, "ruins"); bs = cdi.getBeans(false, injection); assertEquals(2, bs.size()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java 2011-08-09 20:44:15 UTC (rev 33736) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java 2011-08-09 20:44:40 UTC (rev 33737) @@ -73,4 +73,11 @@ } assertEquals(3, count); } -} \ No newline at end of file + + public void testExactInDependentProject() throws CoreException, IOException { + ICDIProject cdi = getDependentCDIProject(); + + Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/exact/FishFactory.java")); + assertEquals(2, bs.size()); + } +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-08-09 20:44:15 UTC (rev 33736) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-08-09 20:44:40 UTC (rev 33737) @@ -28,18 +28,31 @@ protected static String PLUGIN_ID = "org.jboss.tools.cdi.seam.solder.core.test"; protected static String PROJECT_NAME = "CDISolderTest"; protected static String PROJECT_PATH = "/projects/CDISolderTest"; + protected static String DEPENDENT_PROJECT_NAME = "CDIDependentSolderTest"; + protected static String DEPENDENT_PROJECT_PATH = "/projects/CDIDependentSolderTest"; private ICDIProject cdiProject; private IProject project; + private IProject dependentProject; + private ICDIProject cdiDependentProject; + public IProject getTestProject() { if(cdiProject==null) { - project = findTestProject(); + project = findTestProject(PROJECT_NAME); cdiProject = CDICorePlugin.getCDIProject(project, true); } return project; } + public IProject getDependentTestProject() { + if(cdiDependentProject==null) { + dependentProject = findTestProject(DEPENDENT_PROJECT_NAME); + cdiDependentProject = CDICorePlugin.getCDIProject(dependentProject, true); + } + return dependentProject; + } + public ICDIProject getCDIProject() { if(cdiProject==null) { getTestProject(); @@ -47,32 +60,15 @@ return cdiProject; } - // protected IProject project; -// protected ICDIProject cdiProject; + public ICDIProject getDependentCDIProject() { + if(cdiDependentProject==null) { + getDependentTestProject(); + } + return cdiDependentProject; + } -// public SeamSolderTest() { -// project = getTestProject(); -// cdiProject = CDICorePlugin.getCDIProject(project, false); -// } -// -// public IProject getTestProject() { -// if(project==null) { -// try { -// project = findTestProject(); -// if(project==null || !project.exists()) { -// project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); -// project.build(IncrementalProjectBuilder.FULL_BUILD, null); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// fail("Can't import CDI test project: " + e.getMessage()); -// } -// } -// return project; -// } - - public static IProject findTestProject() { - return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + public static IProject findTestProject(String name) { + return ResourcesPlugin.getWorkspace().getRoot().getProject(name); } protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-08-09 20:44:15 UTC (rev 33736) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-08-09 20:44:40 UTC (rev 33737) @@ -25,6 +25,7 @@ public class SeamSolderTestSetup extends TestSetup { protected IProject project; + protected IProject dependentProject; public SeamSolderTestSetup(Test test) { super(test); @@ -37,12 +38,18 @@ project = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.PROJECT_PATH); TestUtil._waitForValidation(project); } + dependentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamSolderTest.DEPENDENT_PROJECT_NAME); + if(dependentProject == null || !dependentProject.exists()) { + dependentProject = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.DEPENDENT_PROJECT_PATH); + TestUtil._waitForValidation(dependentProject); + } } @Override protected void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); project.delete(true, true, null); + dependentProject.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33736 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core: validation and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-08-09 16:44:15 -0400 (Tue, 09 Aug 2011) New Revision: 33736 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: JBIDE-9484 https://issues.jboss.org/browse/JBIDE-9484 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-08-09 20:15:03 UTC (rev 33735) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-08-09 20:44:15 UTC (rev 33736) @@ -482,6 +482,21 @@ public Dependencies getDependencies() { return dependencies; } + + public Dependencies getAllDependencies() { + Set<CDICoreNature> ns = project.getCDIProjects(true); + if(!ns.isEmpty()) { + Dependencies d = new Dependencies(); + d.direct.putAll(dependencies.direct); + d.reverse.putAll(dependencies.reverse); + for (CDICoreNature n: ns) { + d.direct.putAll(n.getDefinitions().getDependencies().direct); + d.reverse.putAll(n.getDefinitions().getDependencies().reverse); + } + return d; + } + return dependencies; + } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-09 20:15:03 UTC (rev 33735) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-09 20:44:15 UTC (rev 33736) @@ -113,6 +113,7 @@ IValidatingProjectTree projectTree; IValidatingProjectSet projectSet; Set<IFolder> sourceFolders; + Dependencies dependencies; private Set<IInjectionPointValidatorFeature> injectionValidationFeatures; @@ -209,6 +210,7 @@ if(cdiProject==null) { CDICorePlugin.getDefault().logError("Trying to validate " + rootProject + " but CDI Tools model for the project is not built."); } + dependencies = nature.getDefinitions().getAllDependencies(); injectionValidationFeatures = nature.getExtensionManager().getFeatures(IInjectionPointValidatorFeature.class); } projectName = projectSet.getRootProject().getName(); @@ -231,10 +233,9 @@ Set<IPath> resources = new HashSet<IPath>(); // Resources which we have // to validate. Set<IPath> resourcesToClean = new HashSet<IPath>(); // Resource which we should remove from validation context - Dependencies ds = cdiProject.getNature().getDefinitions().getDependencies(); for(IFile file: changedFiles) { resourcesToClean.add(file.getFullPath()); - Set<IPath> dd = ds.getDirectDependencies(file.getFullPath()); + Set<IPath> dd = dependencies.getDirectDependencies(file.getFullPath()); if(dd != null) { for (IPath p: dd) { IFile f = root.getFile(p); @@ -414,8 +415,7 @@ displaySubtask(CDIValidationMessages.VALIDATING_RESOURCE, new String[] {file.getProject().getName(), file.getName()}); coreHelper.getValidationContextManager().addValidatedProject(this, file.getProject()); - Dependencies ds = cdiProject.getNature().getDefinitions().getDependencies(); - Set<IPath> dd = ds.getDirectDependencies(file.getFullPath()); + Set<IPath> dd = dependencies.getDirectDependencies(file.getFullPath()); if(dd != null && !dd.isEmpty()) { Set<IPath> resources = new HashSet<IPath>(); for (IPath p: dd) { @@ -451,6 +451,10 @@ validateInterceptorBinding(binding); } Set<IValidatorFeature> extensions = cdiProject.getNature().getExtensionManager().getValidatorFeatures(); + Set<CDICoreNature> ns = cdiProject.getNature().getCDIProjects(); + for (CDICoreNature n: ns) { + extensions.addAll(n.getExtensionManager().getValidatorFeatures()); + } for (IValidatorFeature v: extensions) { setSeverityPreferences(v.getSeverityPreferences()); v.validateResource(file, this);

14 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2011