Author: scabanovich Date: 2011-09-13 17:24:04 -0400 (Tue, 13 Sep 2011) New Revision: 34697 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigFieldDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigMethodDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigTypeDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigVirtualFieldDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamVirtualFieldDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/TextSourceReference.java Log: JBIDE-9347 https://issues.jboss.org/browse/JBIDE-9347 Config beans decorated. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -192,21 +192,21 @@ if(CDISeamConfigConstants.ERROR_UNRESOLVED_TYPE.equals(problemId)) { String name = node instanceof SAXElement ? ((SAXElement)node).getName() : node instanceof SAXAttribute ? ((SAXAttribute)node).getName() : null; String message = NLS.bind(SeamConfigValidationMessages.UNRESOLVED_TYPE, name); - validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_TYPE, new TextSourceReference(file, node), file); + validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_TYPE, new TextSourceReference(def.getFileObject(), file, node), file); } else if(CDISeamConfigConstants.ERROR_UNRESOLVED_MEMBER.equals(problemId)) { String name = node instanceof SAXElement ? ((SAXElement)node).getName() : node instanceof SAXAttribute ? ((SAXAttribute)node).getName() : null; String message = NLS.bind(SeamConfigValidationMessages.UNRESOLVED_MEMBER, name); - validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_MEMBER, new TextSourceReference(file, node), file); + validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_MEMBER, new TextSourceReference(def.getFileObject(), file, node), file); } else if(CDISeamConfigConstants.ERROR_UNRESOLVED_METHOD.equals(problemId)) { String message = NLS.bind(SeamConfigValidationMessages.UNRESOLVED_METHOD, ((SAXElement)node).getName()); - validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_METHOD, new TextSourceReference(file, node), file); + validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_METHOD, new TextSourceReference(def.getFileObject(), file, node), file); } else if(CDISeamConfigConstants.ERROR_UNRESOLVED_CONSTRUCTOR.equals(problemId)) { String name = node instanceof SAXElement && ((SAXElement)node).getParent() != null ? ((SAXElement)node).getParent().getName() : null; String message = NLS.bind(SeamConfigValidationMessages.UNRESOLVED_CONSTRUCTOR, name); - validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_CONSTRUCTOR, new TextSourceReference(file, node), file); + validator.addError(message, CDISeamConfigPreferences.UNRESOLVED_CONSTRUCTOR, new TextSourceReference(def.getFileObject(), file, node), file); } else if(CDISeamConfigConstants.ERROR_ANNOTATION_EXPECTED.equals(problemId)) { String message = NLS.bind(SeamConfigValidationMessages.ANNOTATION_EXPECTED, null); - validator.addError(message, CDISeamConfigPreferences.ANNOTATION_EXPECTED, new TextSourceReference(file, node), file); + validator.addError(message, CDISeamConfigPreferences.ANNOTATION_EXPECTED, new TextSourceReference(def.getFileObject(), file, node), file); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigFieldDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigFieldDefinition.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigFieldDefinition.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -28,7 +28,7 @@ public void setConfig(SeamFieldDefinition config) { this.config = config; - setOriginalDefinition(new TextSourceReference(config.getResource(), config.getNode())); + setOriginalDefinition(new TextSourceReference(file, config.getResource(), config.getNode())); } public SeamFieldDefinition getConfig() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigMethodDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigMethodDefinition.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigMethodDefinition.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -28,7 +28,7 @@ public void setConfig(SeamMethodDefinition config) { this.config = config; - setOriginalDefinition(new TextSourceReference(config.getResource(), config.getNode())); + setOriginalDefinition(new TextSourceReference(file, config.getResource(), config.getNode())); } public SeamMethodDefinition getConfig() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigTypeDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigTypeDefinition.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigTypeDefinition.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -32,7 +32,7 @@ public void setConfig(SeamBeanDefinition config) { this.config = config; - setOriginalDefinition(new TextSourceReference(config.getResource(), config.getNode())); + setOriginalDefinition(new TextSourceReference(file, config.getResource(), config.getNode())); } public SeamBeanDefinition getConfig() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigVirtualFieldDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigVirtualFieldDefinition.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/ConfigVirtualFieldDefinition.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -28,7 +28,7 @@ public void setConfig(SeamVirtualFieldDefinition config) { this.config = config; - setOriginalDefinition(new TextSourceReference(config.getResource(), config.getNode())); + setOriginalDefinition(new TextSourceReference(file, config.getResource(), config.getNode())); } public void setFileObject(XModelObject file) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -59,6 +59,10 @@ this.file = file; } + public XModelObject getFileObject() { + return file; + } + public IResource getResource() { return resource; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamVirtualFieldDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamVirtualFieldDefinition.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamVirtualFieldDefinition.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -10,10 +10,7 @@ ******************************************************************************/ package org.jboss.tools.cdi.seam.config.core.definition; -import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IType; -import org.jboss.tools.cdi.seam.config.core.xml.SAXAttribute; -import org.jboss.tools.cdi.seam.config.core.xml.SAXElement; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/TextSourceReference.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/TextSourceReference.java 2011-09-13 21:22:29 UTC (rev 34696) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/TextSourceReference.java 2011-09-13 21:24:04 UTC (rev 34697) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011 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.seam.config.core.definition; import org.eclipse.core.resources.IResource; @@ -2,9 +12,19 @@ import org.jboss.tools.cdi.seam.config.core.xml.SAXNode; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; +import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.ITextSourceReference; +/** + * + * @author Viacheslav Kabanovich + * + */ public class TextSourceReference implements ITextSourceReference { + XModelObject fileObject; IResource resource; SAXNode node; - public TextSourceReference(IResource resource, SAXNode node) { + public TextSourceReference(XModelObject fileObject, IResource resource, SAXNode node) { + this.fileObject = fileObject; this.resource = resource; @@ -25,4 +45,23 @@ return resource; } + public String toString() { + //Used in AssignableBeansDialog. + //If alternative usage is needed, should be moved to another interface. + StringBuffer sb = new StringBuffer(); + sb.append(FileAnyImpl.toFileName(fileObject)); + sb.append(", line=").append(node.getLocation().getLine()); + sb.append(" - "); + if(resource != null) { + sb.append(resource.getFullPath().toString()); + } else if(fileObject != null) { + String path = fileObject.getPath(); + XModelObject s = fileObject; + while(s != null && s.getFileType() != XModelObject.SYSTEM) s = s.getParent(); + sb.append("/").append(EclipseResourceUtil.getProject(fileObject).getName()); + sb.append("/").append(s.getAttributeValue("name")).append(path.substring(s.getPath().length())); + } + return sb.toString(); + } + }