Author: akazakov Date: 2009-11-06 12:17:32 -0500 (Fri, 06 Nov 2009) New Revision: 18458 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/ITextSourceReference.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaSourceReference.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/IValueInfo.java trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidationErrorManager.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamElementMatch.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchRequestor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchViewLabelProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4943 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-11-06 17:17:32 UTC (rev 18458) @@ -7,7 +7,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.common, - org.eclipse.jdt.core;bundle-version="3.5.0" + org.eclipse.jdt.core, + org.eclipse.core.resources, + org.jboss.tools.common.model Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -7,13 +7,113 @@ * * Contributors: * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.cdi.core; +import java.util.Set; + +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IType; +import org.jboss.tools.common.text.ITextSourceReference; + /** - * Represents a managed bean + * Represents a CDI bean. + * * @author Alexey Kazakov */ -public interface IBean { +public interface IBean extends ICDIElement { + /** + * Obtains the types of the bean. + * + * @return the bean types + */ + Set<IType> getTypes(); + + /** + * Returns the location of a type declaration of this bean. If the bean + * doesn't have such declaration then null will be returned. + * + * @param type + * @return the location of the type of this bean. + */ + ITextSourceReference getTypeLocation(IType type); + + /** + * Obtains the qualifiers of the bean. + * + * @return the qualifiers + */ + Set<IAnnotation> getQualifiers(); + + /** + * Returns the location of a qualifier declaration of this bean. If the bean + * doesn't have such declaration then null will be returned. + * + * @param qualifier + * @return the location of the qualifier declaration of this bean. + */ + ITextSourceReference getQualifierLocation(IType qualifier); + + /** + * Obtains the EL name of the bean, if it has one. + * + * @return the EL name + */ + String getName(); + + /** + * Returns the location of a name declaration of this bean. If the bean + * doesn't have the name declaration then null will be returned. + * + * @return the location of a name declaration of this bean. + */ + ITextSourceReference getNameLocation(); + + /** + * Obtains the scope of the bean. + * + * @return the scope + */ + IScope getScope(); + + /** + * Returns the location of a scope declaration of this bean. If the bean + * doesn't have the scope declaration then null will be returned. + * + * @return the location of a scope declaration of this bean. + */ + ITextSourceReference getScopeLocation(); + + /** + * Obtains the stereotypes of the bean. + * + * @return the set of stereotypes + */ + Set<IStereotype> getStereotypes(); + + /** + * Returns the location of a stereotype declaration of this bean. If the + * bean doesn't have such stereotype declaration then null will be returned. + * + * @param qualifier + * @return the location of the stereotype declaration of this bean. + */ + ITextSourceReference getStereotypeLocation(IStereotype stereotype); + + /** + * Determines if the bean is an alternative. + * + * @return <tt>true</tt> if the bean is an alternative, and <tt>false</tt> + * otherwise. + */ + boolean isAlternative(); + + /** + * Obtains the injection points of the bean. + * + * @return the set of injection points of the bean + */ + Set<IInjectionPoint> getInjectionPoints(); + } \ No newline at end of file Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -0,0 +1,40 @@ +/******************************************************************************* + * 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.cdi.core; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IPath; + +/** + * Common interface for objects of CDI model. + * + * @author Alexey Kazakov + */ +public interface ICDIElement { + + /** + * Returns CDI project that contains this object. + * @return + */ + ICDIProject getCDIProject(); + + /** + * Returns path of resource that declares this object. + * @return + */ + IPath getSourcePath(); + + /** + * Returns resource that declares this object. + * @return resource + */ + IResource getResource(); +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -0,0 +1,22 @@ +/******************************************************************************* + * 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.cdi.core; + +import org.jboss.tools.common.text.ITextSourceReference; + +/** + * Represents an injection point. + * + * @author Alexey Kazakov + */ +public interface IInjectionPoint extends ICDIElement, ITextSourceReference { + +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2009-11-06 17:17:32 UTC (rev 18458) @@ -121,6 +121,7 @@ org.apache.xml.resolver.tools, org.apache.xml.serialize, org.jboss.tools.common, + org.jboss.tools.common.java, org.jboss.tools.common.log, org.jboss.tools.common.preferences, org.jboss.tools.common.reporting, Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -0,0 +1,22 @@ +/******************************************************************************* + * 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.common.java; + +import org.eclipse.jdt.core.IMember; +import org.jboss.tools.common.text.ITextSourceReference; + +/** + * @author Alexey Kazakov + */ +public interface IJavaSourceReference extends ITextSourceReference { + + IMember getSourceMember(); +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -0,0 +1,28 @@ + /******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.text; + +/** + * An interface of seam tools model object that has text source. + * @author Alexey Kazakov + */ +public interface ITextSourceReference { + + /** + * @return start position of element in text + */ + public int getStartPosition(); + + /** + * @return number of characters of element in text + */ + public int getLength(); +} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IResource; import org.jboss.tools.common.el.core.parser.LexicalToken; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; /** * Describes a segment of EL operand. Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -15,7 +15,7 @@ import org.eclipse.core.resources.IResource; import org.jboss.tools.common.el.core.parser.LexicalToken; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; /** * @author Alexey Kazakov Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/ITextSourceReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/ITextSourceReference.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/ITextSourceReference.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -1,28 +0,0 @@ - /******************************************************************************* - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.model.project.ext; - -/** - * An interface of seam tools model object that has text source. - * @author Alexey Kazakov - */ -public interface ITextSourceReference { - - /** - * @return start position of element in text - */ - public int getStartPosition(); - - /** - * @return number of characters of element in text - */ - public int getLength(); -} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/IValueInfo.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/IValueInfo.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/IValueInfo.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -12,6 +12,7 @@ import java.util.Properties; +import org.jboss.tools.common.text.ITextSourceReference; import org.w3c.dom.Element; /** Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -26,8 +26,8 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.eclipse.wst.validation.internal.provisional.core.IValidator; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; import org.jboss.tools.common.preferences.SeverityPreferences; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.WebKbPlugin; import org.jboss.tools.jst.web.kb.validation.IValidationContext; import org.jboss.tools.jst.web.kb.validation.IValidationErrorManager; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/ELReference.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -28,7 +28,7 @@ import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.el.core.parser.SyntaxError; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jst.web.kb.WebKbPlugin; import org.w3c.dom.Element; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidationErrorManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidationErrorManager.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/IValidationErrorManager.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; /** * @author Alexey Kazakov Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.seam.core; +import org.jboss.tools.common.java.IJavaSourceReference; + /** * Base interface of bijected attribute of seam component. * @author Alexey Kazakov */ -public interface IBijectedAttribute extends ISeamContextVariable, ISeamJavaSourceReference { +public interface IBijectedAttribute extends ISeamContextVariable, IJavaSourceReference { /** * @return type of attribute Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.seam.core; +import org.jboss.tools.common.java.IJavaSourceReference; + /** * Represents @Role of seam component. * @author Alexey Kazakov */ -public interface IRole extends ISeamJavaSourceReference, ISeamContextVariable { +public interface IRole extends IJavaSourceReference, ISeamContextVariable { public IRole clone() throws CloneNotSupportedException; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.seam.core; +import org.jboss.tools.common.java.IJavaSourceReference; + /** * Represents seam factory method which was declared by @Factory * @author Alexey Kazakov */ -public interface ISeamAnnotatedFactory extends ISeamFactory, ISeamJavaSourceReference { +public interface ISeamAnnotatedFactory extends ISeamFactory, IJavaSourceReference { boolean isAutoCreate(); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentDeclaration.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; /** * Represents declaration of seam component. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -12,12 +12,14 @@ import java.util.Set; +import org.jboss.tools.common.java.IJavaSourceReference; + /** * Represents method of seam component. * This interface represents only methods with types enumerated in SeamComponentMethodType * @author Alexey Kazakov */ -public interface ISeamComponentMethod extends ISeamJavaSourceReference, ISeamElement { +public interface ISeamComponentMethod extends IJavaSourceReference, ISeamElement { /** * @return is types of the method Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamDeclaration.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamDeclaration.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -11,7 +11,7 @@ package org.jboss.tools.seam.core; import org.eclipse.core.runtime.IAdaptable; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; /** * @author Viacheslav Kabanovich @@ -30,5 +30,4 @@ * invoke getLocationFor("name"); */ public ITextSourceReference getLocationFor(String path); - -} +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaComponentDeclaration.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -12,11 +12,13 @@ import java.util.Set; +import org.jboss.tools.common.java.IJavaSourceReference; + /** * Represents java class of seam component. * @author Alexey Kazakov */ -public interface ISeamJavaComponentDeclaration extends ISeamComponentDeclaration, ISeamJavaSourceReference { +public interface ISeamJavaComponentDeclaration extends ISeamComponentDeclaration, IJavaSourceReference { public static final int DEFAULT_PRECEDENCE = SeamComponentPrecedenceType.APPLICATION; Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaSourceReference.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaSourceReference.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaSourceReference.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -1,23 +0,0 @@ - /******************************************************************************* - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.seam.core; - -import org.eclipse.jdt.core.IMember; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; - -/** - * An interface of seam tools model object that has associated source object in JDT model - * @author Alexey Kazakov - */ -public interface ISeamJavaSourceReference extends ITextSourceReference { - - public IMember getSourceMember(); -} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.seam.core.event.ISeamValue; /** Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; /** * Represents <factory> element in components.xml Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -34,8 +34,8 @@ import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.internal.core.AbstractContextVariable; import org.jboss.tools.seam.internal.core.SeamComponentDeclaration; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -18,9 +18,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; import org.jboss.tools.common.model.project.ext.IValueInfo; import org.jboss.tools.common.model.project.ext.event.Change; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.model.project.ext.store.XMLStoreHelper; import org.jboss.tools.seam.core.IOpenableElement; import org.jboss.tools.seam.core.ISeamDeclaration; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -16,8 +16,8 @@ import java.util.List; import java.util.Set; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; import org.jboss.tools.common.model.project.ext.event.Change; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute; import org.jboss.tools.seam.core.IRole; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -1,6 +1,6 @@ package org.jboss.tools.seam.internal.core; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.seam.core.ISeamContextShortVariable; import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ScopeType; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -22,6 +22,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.JavaUI; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.options.PreferenceModelUtilities; @@ -29,11 +30,10 @@ import org.jboss.tools.common.xml.XMLUtilities; import org.jboss.tools.jst.web.model.project.ext.store.XMLStoreHelper; import org.jboss.tools.seam.core.ISeamElement; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.SeamCorePlugin; import org.w3c.dom.Element; -public abstract class SeamJavaContextVariable extends AbstractContextVariable implements ISeamJavaSourceReference { +public abstract class SeamJavaContextVariable extends AbstractContextVariable implements IJavaSourceReference { protected IMember javaSource = null; public SeamJavaContextVariable() {} Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; /** * @author Alexey Kazakov Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -49,9 +49,10 @@ import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.Var; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.common.model.project.ext.event.Change; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine; import org.jboss.tools.seam.core.IBijectedAttribute; @@ -59,7 +60,6 @@ import org.jboss.tools.seam.core.ISeamContextShortVariable; import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ISeamElement; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.ISeamMessages; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.ISeamXmlFactory; @@ -524,7 +524,7 @@ } } -class StringVariable implements ISeamContextVariable, ISeamJavaSourceReference { +class StringVariable implements ISeamContextVariable, IJavaSourceReference { IMember member; public StringVariable(IMember member) { this.member = member; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -36,6 +36,7 @@ import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.Type; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.TypeInfo; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.TypeMemberInfo; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute; @@ -45,7 +46,6 @@ import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.ISeamMessages; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.ISeamXmlFactory; @@ -137,10 +137,10 @@ } } if (member == null && variable instanceof IBijectedAttribute) { - member = ((ISeamJavaSourceReference)variable).getSourceMember(); + member = ((IJavaSourceReference)variable).getSourceMember(); } - if (member == null && variable instanceof ISeamJavaSourceReference) { - member = ((ISeamJavaSourceReference)variable).getSourceMember(); + if (member == null && variable instanceof IJavaSourceReference) { + member = ((IJavaSourceReference)variable).getSourceMember(); } if (member == null && variable instanceof ISeamXmlFactory) { ISeamXmlFactory factory = (ISeamXmlFactory)variable; @@ -216,8 +216,8 @@ */ @Override public IJavaElement getJavaElement() { - if(messages instanceof ISeamJavaSourceReference) { - return ((ISeamJavaSourceReference)messages).getSourceMember(); + if(messages instanceof IJavaSourceReference) { + return ((IJavaSourceReference)messages).getSourceMember(); } else if(messages instanceof ISeamComponent) { ISeamComponent c = (ISeamComponent)messages; ISeamJavaComponentDeclaration d = c.getJavaDeclaration(); @@ -304,10 +304,10 @@ break; } } - member = TypeInfoCollector.createMemberInfo(((ISeamJavaSourceReference)variable).getSourceMember(), isDataModel); + member = TypeInfoCollector.createMemberInfo(((IJavaSourceReference)variable).getSourceMember(), isDataModel); } - if (member == null && variable instanceof ISeamJavaSourceReference) { - member = TypeInfoCollector.createMemberInfo(((ISeamJavaSourceReference)variable).getSourceMember()); + if (member == null && variable instanceof IJavaSourceReference) { + member = TypeInfoCollector.createMemberInfo(((IJavaSourceReference)variable).getSourceMember()); } if (member == null && variable instanceof ISeamXmlFactory) { ISeamXmlFactory factory = (ISeamXmlFactory)variable; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -30,7 +30,7 @@ import org.eclipse.text.edits.TextEdit; import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.model.ELPropertyInvocation; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -34,9 +34,10 @@ import org.eclipse.wst.validation.internal.core.ValidationException; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.jst.web.kb.KbProjectFactory; import org.jboss.tools.jst.web.kb.internal.KbProject; @@ -55,7 +56,6 @@ import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ISeamFactory; import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.ISeamProperty; import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; @@ -677,7 +677,7 @@ return location; } - private ITextSourceReference getNameLocation(ISeamJavaSourceReference source) { + private ITextSourceReference getNameLocation(IJavaSourceReference source) { int length = 0; int offset = 0; try { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamElementMatch.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamElementMatch.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamElementMatch.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -14,9 +14,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.search.ui.text.Match; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.seam.core.ISeamDeclaration; import org.jboss.tools.seam.core.ISeamElement; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.ui.SeamGuiPlugin; /** @@ -42,7 +42,7 @@ * * @param element */ - public SeamElementMatch(ISeamJavaSourceReference element) { + public SeamElementMatch(IJavaSourceReference element) { super(element, 0, 0); if (element != null && element.getSourceMember() != null && element.getSourceMember().getResource() != null) { fCreationTimeStamp= element.getSourceMember().getResource().getModificationStamp(); @@ -84,8 +84,8 @@ * @return */ public IFile getFile() { - if (getElement() instanceof ISeamJavaSourceReference) { - return (IFile) ((ISeamJavaSourceReference)getElement()).getSourceMember().getResource(); + if (getElement() instanceof IJavaSourceReference) { + return (IFile) ((IJavaSourceReference)getElement()).getSourceMember().getResource(); } else if (getElement() instanceof ISeamDeclaration) { return (IFile) ((ISeamDeclaration)getElement()).getResource(); } else if (getElement() instanceof IFile) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -11,7 +11,6 @@ package org.jboss.tools.seam.ui.search; import java.util.ArrayList; -import java.util.List; import java.util.regex.Pattern; import org.eclipse.core.resources.IFile; @@ -33,8 +32,8 @@ import org.eclipse.search.ui.text.AbstractTextSearchResult; import org.eclipse.search.ui.text.Match; import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.seam.core.ISeamDeclaration; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine; @@ -136,7 +135,7 @@ } return buf.toString(); } - public boolean acceptSeamDeclarationSourceReferenceMatch(ISeamJavaSourceReference element) throws CoreException { + public boolean acceptSeamDeclarationSourceReferenceMatch(IJavaSourceReference element) throws CoreException { fCachedMatches.add(new SeamElementMatch(element)); return true; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchRequestor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchRequestor.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchRequestor.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -15,8 +15,8 @@ import org.eclipse.jdt.ui.search.ISearchRequestor; import org.eclipse.search.core.text.TextSearchRequestor; import org.eclipse.search.ui.text.Match; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.seam.core.ISeamDeclaration; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; /** * Seam Search Requestor @@ -36,7 +36,7 @@ * @throws CoreException implementors can throw a {@link CoreException} if accessing the resource fails or another * problem prevented the processing of the search match. */ - public boolean acceptSeamDeclarationSourceReferenceMatch(ISeamJavaSourceReference reference) throws CoreException { + public boolean acceptSeamDeclarationSourceReferenceMatch(IJavaSourceReference reference) throws CoreException { return true; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -45,10 +45,8 @@ import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.internal.ui.text.EditorOpener; import org.eclipse.search.internal.ui.text.FileLabelProvider; -import org.eclipse.search.internal.ui.text.FileSearchQuery; import org.eclipse.search.internal.ui.text.IFileSearchContentProvider; import org.eclipse.search.internal.ui.text.NewTextSearchActionGroup; - import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.ISearchResultViewPart; import org.eclipse.search.ui.NewSearchUI; @@ -72,8 +70,8 @@ import org.eclipse.ui.part.IShowInTargetList; import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.texteditor.ITextEditor; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.seam.core.IOpenableElement; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; /** * Seam Search Result page @@ -200,8 +198,8 @@ * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#showMatch(org.eclipse.search.ui.text.Match, int, int, boolean) */ protected void showMatch(Match match, int offset, int length, boolean activate) throws PartInitException { - if (match.getElement() instanceof ISeamJavaSourceReference) { - IJavaElement javaElement = ((ISeamJavaSourceReference)match.getElement()).getSourceMember(); + if (match.getElement() instanceof IJavaSourceReference) { + IJavaElement javaElement = ((IJavaSourceReference)match.getElement()).getSourceMember(); try { IEditorPart part = JavaUI.openInEditor(javaElement); if (part != null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchViewLabelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchViewLabelProvider.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchViewLabelProvider.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -20,9 +20,9 @@ import org.eclipse.search.internal.ui.text.FileLabelProvider; import org.eclipse.search.ui.text.AbstractTextSearchViewPage; import org.eclipse.swt.graphics.Image; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ISeamElement; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.ui.views.SeamLabelProvider; @@ -57,7 +57,7 @@ @Override public Image getImage(Object element) { if (element instanceof ISeamContextVariable || - element instanceof ISeamJavaSourceReference) { + element instanceof IJavaSourceReference) { return fSeamLabelProvider.getImage(element); } if (element instanceof ISeamElement) { @@ -85,7 +85,7 @@ @Override public String getText(Object element) { if (element instanceof ISeamContextVariable || - element instanceof ISeamJavaSourceReference) { + element instanceof IJavaSourceReference) { return fSeamLabelProvider.getText(element); } if (element instanceof ISeamElement) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -96,12 +96,12 @@ import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.model.ELModel; import org.jboss.tools.common.el.core.parser.ELParser; -import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; import org.jboss.tools.common.el.core.resolver.Var; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.common.model.util.EclipseJavaUtil; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute; import org.jboss.tools.seam.core.IOpenableElement; @@ -110,7 +110,6 @@ import org.jboss.tools.seam.core.ISeamContextShortVariable; import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ISeamDeclaration; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCoreMessages; import org.jboss.tools.seam.core.SeamCorePlugin; @@ -832,8 +831,8 @@ SeamComponent comp = (SeamComponent)variable; Set<ISeamComponentDeclaration> declarations = comp.getAllDeclarations(); for (ISeamComponentDeclaration decl : declarations) { - if (decl instanceof ISeamJavaSourceReference) { - ISeamJavaSourceReference sourceRef = (ISeamJavaSourceReference)decl; + if (decl instanceof IJavaSourceReference) { + IJavaSourceReference sourceRef = (IJavaSourceReference)decl; IResource resource = sourceRef.getSourceMember().getResource(); IJavaElement sourceMember = sourceRef.getSourceMember(); String name = sourceRef.getSourceMember().getElementName(); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -26,13 +26,13 @@ import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonLabelProvider; import org.eclipse.ui.navigator.IExtensionStateModel; +import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.seam.core.IRole; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentDeclaration; import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamFactory; import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; -import org.jboss.tools.seam.core.ISeamJavaSourceReference; import org.jboss.tools.seam.core.ISeamPackage; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.ISeamScope; @@ -122,8 +122,8 @@ } else if (element instanceof ISeamFactory) { ISeamFactory f = (ISeamFactory)element; return f.getName() + " - " + f.getSourcePath(); - } else if(element instanceof ISeamJavaSourceReference) { - ISeamJavaSourceReference d = (ISeamJavaSourceReference)element; + } else if(element instanceof IJavaSourceReference) { + IJavaSourceReference d = (IJavaSourceReference)element; IMember m = d.getSourceMember(); IType type = (m instanceof IType) ? (IType)m : m.getTypeRoot().findPrimaryType(); if(type.isBinary()) { Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2009-11-06 16:12:58 UTC (rev 18457) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2009-11-06 17:17:32 UTC (rev 18458) @@ -20,8 +20,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.NullProgressMonitor; -import org.jboss.tools.common.model.project.ext.ITextSourceReference; import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.seam.core.BeanType; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute;