Author: scabanovich Date: 2011-05-02 15:49:17 -0400 (Mon, 02 May 2011) New Revision: 31012 Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/Location.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXAttribute.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXElement.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXNode.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXText.java Removed: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXText.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/AbstractSeamFieldDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.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/SeamFieldDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.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/scanner/SeamDefinitionBuilder.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF 2011-05-02 19:49:17 UTC (rev 31012) @@ -31,5 +31,6 @@ Export-Package: org.jboss.tools.cdi.seam.config.core, org.jboss.tools.cdi.seam.config.core.definition, org.jboss.tools.cdi.seam.config.core.scanner, + org.jboss.tools.cdi.seam.config.core.xml, org.jboss.tools.cdi.seam.config.core.util Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/AbstractSeamFieldDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/AbstractSeamFieldDefinition.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/AbstractSeamFieldDefinition.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -16,9 +16,9 @@ import java.util.Map; import org.eclipse.jdt.core.IField; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXAttribute; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXText; +import org.jboss.tools.cdi.seam.config.core.xml.SAXAttribute; +import org.jboss.tools.cdi.seam.config.core.xml.SAXElement; +import org.jboss.tools.cdi.seam.config.core.xml.SAXText; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -15,7 +15,7 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement; +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/SeamBeansDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeansDefinition.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -28,7 +28,7 @@ import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXNode; +import org.jboss.tools.cdi.seam.config.core.xml.SAXNode; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -11,8 +11,8 @@ package org.jboss.tools.cdi.seam.config.core.definition; import org.eclipse.jdt.core.IField; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXAttribute; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement; +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/SeamMemberDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -14,9 +14,9 @@ import java.util.Map; import org.jboss.tools.cdi.core.IJavaAnnotation; -import org.jboss.tools.cdi.seam.config.core.scanner.Location; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXNode; +import org.jboss.tools.cdi.seam.config.core.xml.Location; +import org.jboss.tools.cdi.seam.config.core.xml.SAXElement; +import org.jboss.tools.cdi.seam.config.core.xml.SAXNode; /** * 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-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamVirtualFieldDefinition.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -12,8 +12,8 @@ import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IType; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXAttribute; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement; +import org.jboss.tools.cdi.seam.config.core.xml.SAXAttribute; +import org.jboss.tools.cdi.seam.config.core.xml.SAXElement; /** * Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -1,42 +0,0 @@ -/******************************************************************************* - * 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.scanner; - -import org.eclipse.core.resources.IFile; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class Location { - IFile file; - int start; - int length; - - public Location(int start, int length) { - this.start = start; - this.length = length; - } - - public int getStartPosition() { - return start; - } - - public int getLength() { - return length; - } - - public IFile getResource() { - return file; - } - -} Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -1,56 +0,0 @@ -/******************************************************************************* - * 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.scanner; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class SAXAttribute extends SAXText { - private String name; - private Location nameLocation; - - private SAXElement parent; - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setNameLocation(Location location) { - nameLocation = location; - } - - public Location getNameLocation() { - return nameLocation; - } - - public void setValueLocation(Location location) { - setLocation(location); - } - - public Location getValueLocation() { - return getLocation(); - } - - public void setParent(SAXElement parent) { - this.parent = parent; - } - - public SAXElement getParent() { - return parent; - } - -} Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -1,111 +0,0 @@ -/******************************************************************************* - * 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.scanner; - -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class SAXElement extends SAXNode { - protected String uri; - protected String localName; - protected String name; - protected Location nameLocation; - protected Map<String, SAXAttribute> attributes = new HashMap<String, SAXAttribute>(); - protected SAXText text; - - protected SAXElement parent = null; - protected List<SAXElement> children = new ArrayList<SAXElement>(); - - public SAXElement() {} - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setNameLocation(Location location) { - nameLocation = location; - } - - public Location getNameLocation() { - return nameLocation; - } - - public void setURI(String uri) { - this.uri = uri; - } - - public String getURI() { - return uri; - } - - public void setLocalName(String name) { - localName = name; - } - - public String getLocalName() { - return localName; - } - - public void setTextNode(SAXText text) { - this.text = text; - } - - public SAXText getTextNode() { - return text; - } - - public void addAttribute(SAXAttribute a) { - a.setParent(this); - attributes.put(a.getName(), a); - } - - public boolean hasAttribute(String name) { - return attributes.containsKey(name); - } - - public SAXAttribute getAttribute(String name) { - return attributes.get(name); - } - - public Set<String> getAttributeNames() { - return attributes.keySet(); - } - - public void addChildElement(SAXElement child) { - child.setParent(this); - children.add(child); - } - - public List<SAXElement> getChildElements() { - return children; - } - - public void setParent(SAXElement parent) { - this.parent = parent; - } - - public SAXElement getParent() { - return parent; - } - -} Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -1,29 +0,0 @@ -/******************************************************************************* - * 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.scanner; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class SAXNode { - protected Location location = null; - - public void setLocation(Location location) { - this.location = location; - } - - public Location getLocation() { - return location; - } - -} Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -1,198 +0,0 @@ -package org.jboss.tools.cdi.seam.config.core.scanner; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.jboss.tools.common.CommonPlugin; -import org.jboss.tools.common.xml.SAXValidator; -import org.jboss.tools.common.xml.XMLEntityResolverImpl; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXNotSupportedException; -import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.helpers.XMLReaderFactory; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class SAXParser extends SAXValidator { - - XMLReader createParser1(DefaultHandler handler) { - XMLReader parserInstance = null; - - try { - parserInstance = XMLReaderFactory.createXMLReader(DEFAULT_SAX_PARSER_CLASS_NAME); - } catch (SAXException e) { - return null; - } - - setFeature(parserInstance, NAMESPACES_FEATURE_ID, true); - setFeature(parserInstance, NAMESPACE_PREFIXES_FEATURE_ID, false); - setFeature(parserInstance, VALIDATION_FEATURE_ID, true); - setFeature(parserInstance, VALIDATION_SCHEMA_FEATURE_ID, true); - setFeature(parserInstance, VALIDATION_SCHEMA_CHECKING_FEATURE_ID, false); - setFeature(parserInstance, VALIDATION_DYNAMIC_FEATURE_ID, false); - setFeature(parserInstance, FATAL_ERROR_PROCESSING_FEATURE_ID, false); - - try { - parserInstance.setProperty(ENTITY_RESOLVER_PROPERTY_ID, new XMLEntityResolverImpl()); - } catch (SAXNotRecognizedException e1) { - CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); //$NON-NLS-1$ - } catch (SAXNotSupportedException e1) { - CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); //$NON-NLS-1$ - } - - parserInstance.setContentHandler(handler); - parserInstance.setErrorHandler(handler); - return parserInstance; - } - - public SAXElement parse(InputStream input, IDocument document) { - InputSource s = new InputSource(input); - ConfigHanlder handler = new ConfigHanlder(document); - XMLReader reader = createParser1(handler); - try { - reader.parse(s); - } catch (IOException e) { - CommonPlugin.getDefault().logError(e); - } catch (SAXException e) { - CommonPlugin.getDefault().logError(e); - } - - return handler.getRootElement(); - } - - class ConfigHanlder extends DefaultHandler { - SAXElement root = null; - IDocument document; - Locator locator; - List<String> errors = new ArrayList<String>(); - SAXElement current = null; - - StringBuffer currentText = new StringBuffer(); - Location currentTextLocation = null; - - ConfigHanlder(IDocument document) { - this.document = document; - } - - public SAXElement getRootElement() { - return root; - } - - public void setDocumentLocator (Locator locator) { - this.locator = locator; - } - - private int getCurrentLocation() { - if (locator != null) { - int line = locator.getLineNumber() - 1; - int lineOffset = locator.getColumnNumber() - 1; - try { - return document.getLineOffset(line) + lineOffset; - } catch (BadLocationException e) { - CommonPlugin.getDefault().logError(e); - } - } - return 0; - } - - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - int end = getCurrentLocation(), start = 0; - if(end > 0) { - start = document.get().lastIndexOf("<", end); - } - SAXElement element = new SAXElement(); - element.setLocalName(localName); - element.setURI(uri); - element.setName(qName); - element.setParent(current); - if(start >= 0) { - element.setLocation(new Location(start, end - start)); - int ns = document.get().indexOf(qName, start); - if(ns >= start) { - element.setNameLocation(new Location(ns, qName.length())); - } - } - for (int i = 0; i < attributes.getLength(); i++) { - String n = attributes.getLocalName(i); - String v = attributes.getValue(i); - SAXAttribute a = new SAXAttribute(); - a.setName(n); - a.setValue(v); - int n_start = document.get().indexOf(n, start); - if(n_start >= 0) { - a.setNameLocation(new Location(n_start, n.length())); - int v_start = document.get().indexOf('"', n_start); - if(v_start >= 0) { - a.setValueLocation(new Location(v_start + 1, v.length())); - } - } - //TODO - element.addAttribute(a); - } - - current = element; - currentText = new StringBuffer(); - currentTextLocation = null; - if(root == null) root = element; - } - - public void characters (char ch[], int start, int length) throws SAXException { - String append = new String(ch, start, length); - if(append.trim().length() == 0) return; - int end = getCurrentLocation(), s = 0; - if (end > 0) { - s = end - length; - } - currentText.append(append); - currentTextLocation = new Location(s, length); - } - - public void endElement(String uri, String localName, String qName) throws SAXException { - int end = getCurrentLocation(); - if(end > 0) { - int start = document.get().lastIndexOf("<", end); - Location endLocation = new Location(start, end - start); - //TODO - } - if(currentText.length() > 0) { - SAXText text = new SAXText(); - text.setValue(currentText.toString()); - current.setTextNode(text); - text.setLocation(currentTextLocation); - currentText.setLength(0); - } - - if(current.getParent() != null) { - current.getParent().addChildElement(current); - } - - current = current.getParent(); - } - - - public void error(SAXParseException e) throws SAXException { - String message = e.getMessage(); - errors.add(message); - } - - public void fatalError(SAXParseException e) throws SAXException { - String message = e.getMessage(); - errors.add(message); - } - } - - -} Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXText.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXText.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXText.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -1,29 +0,0 @@ -/******************************************************************************* - * 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.scanner; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class SAXText extends SAXNode { - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - -} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -38,6 +38,10 @@ import org.jboss.tools.cdi.seam.config.core.definition.SeamParameterDefinition; import org.jboss.tools.cdi.seam.config.core.definition.SeamVirtualFieldDefinition; import org.jboss.tools.cdi.seam.config.core.util.Util; +import org.jboss.tools.cdi.seam.config.core.xml.SAXAttribute; +import org.jboss.tools.cdi.seam.config.core.xml.SAXElement; +import org.jboss.tools.cdi.seam.config.core.xml.SAXParser; +import org.jboss.tools.cdi.seam.config.core.xml.SAXText; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-05-02 19:29:25 UTC (rev 31011) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -26,8 +26,8 @@ import org.jboss.tools.cdi.seam.config.core.CDISeamConfigConstants; import org.jboss.tools.cdi.seam.config.core.definition.SeamMethodDefinition; import org.jboss.tools.cdi.seam.config.core.definition.SeamParameterDefinition; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement; -import org.jboss.tools.cdi.seam.config.core.scanner.SAXText; +import org.jboss.tools.cdi.seam.config.core.xml.SAXElement; +import org.jboss.tools.cdi.seam.config.core.xml.SAXText; /** * Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/Location.java (from rev 31002, trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/Location.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/Location.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.xml; + +import org.eclipse.core.resources.IFile; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class Location { + int start; + int length; + + public Location(int start, int length) { + this.start = start; + this.length = length; + } + + public int getStartPosition() { + return start; + } + + public int getLength() { + return length; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/Location.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXAttribute.java (from rev 31002, trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXAttribute.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXAttribute.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -0,0 +1,56 @@ +/******************************************************************************* + * 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.xml; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SAXAttribute extends SAXText { + private String name; + private Location nameLocation; + + private SAXElement parent; + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setNameLocation(Location location) { + nameLocation = location; + } + + public Location getNameLocation() { + return nameLocation; + } + + public void setValueLocation(Location location) { + setLocation(location); + } + + public Location getValueLocation() { + return getLocation(); + } + + public void setParent(SAXElement parent) { + this.parent = parent; + } + + public SAXElement getParent() { + return parent; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXAttribute.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXElement.java (from rev 31002, trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXElement.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXElement.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -0,0 +1,111 @@ +/******************************************************************************* + * 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.xml; + +import java.util.ArrayList; +import java.util.List; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SAXElement extends SAXNode { + protected String uri; + protected String localName; + protected String name; + protected Location nameLocation; + protected Map<String, SAXAttribute> attributes = new HashMap<String, SAXAttribute>(); + protected SAXText text; + + protected SAXElement parent = null; + protected List<SAXElement> children = new ArrayList<SAXElement>(); + + public SAXElement() {} + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setNameLocation(Location location) { + nameLocation = location; + } + + public Location getNameLocation() { + return nameLocation; + } + + public void setURI(String uri) { + this.uri = uri; + } + + public String getURI() { + return uri; + } + + public void setLocalName(String name) { + localName = name; + } + + public String getLocalName() { + return localName; + } + + public void setTextNode(SAXText text) { + this.text = text; + } + + public SAXText getTextNode() { + return text; + } + + public void addAttribute(SAXAttribute a) { + a.setParent(this); + attributes.put(a.getName(), a); + } + + public boolean hasAttribute(String name) { + return attributes.containsKey(name); + } + + public SAXAttribute getAttribute(String name) { + return attributes.get(name); + } + + public Set<String> getAttributeNames() { + return attributes.keySet(); + } + + public void addChildElement(SAXElement child) { + child.setParent(this); + children.add(child); + } + + public List<SAXElement> getChildElements() { + return children; + } + + public void setParent(SAXElement parent) { + this.parent = parent; + } + + public SAXElement getParent() { + return parent; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXElement.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXNode.java (from rev 31002, trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXNode.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXNode.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -0,0 +1,29 @@ +/******************************************************************************* + * 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.xml; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SAXNode { + protected Location location = null; + + public void setLocation(Location location) { + this.location = location; + } + + public Location getLocation() { + return location; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXNode.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java (from rev 31002, trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -0,0 +1,198 @@ +package org.jboss.tools.cdi.seam.config.core.xml; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.jboss.tools.common.CommonPlugin; +import org.jboss.tools.common.xml.SAXValidator; +import org.jboss.tools.common.xml.XMLEntityResolverImpl; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.SAXParseException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.DefaultHandler; +import org.xml.sax.helpers.XMLReaderFactory; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SAXParser extends SAXValidator { + + XMLReader createParser1(DefaultHandler handler) { + XMLReader parserInstance = null; + + try { + parserInstance = XMLReaderFactory.createXMLReader(DEFAULT_SAX_PARSER_CLASS_NAME); + } catch (SAXException e) { + return null; + } + + setFeature(parserInstance, NAMESPACES_FEATURE_ID, true); + setFeature(parserInstance, NAMESPACE_PREFIXES_FEATURE_ID, false); + setFeature(parserInstance, VALIDATION_FEATURE_ID, true); + setFeature(parserInstance, VALIDATION_SCHEMA_FEATURE_ID, true); + setFeature(parserInstance, VALIDATION_SCHEMA_CHECKING_FEATURE_ID, false); + setFeature(parserInstance, VALIDATION_DYNAMIC_FEATURE_ID, false); + setFeature(parserInstance, FATAL_ERROR_PROCESSING_FEATURE_ID, false); + + try { + parserInstance.setProperty(ENTITY_RESOLVER_PROPERTY_ID, new XMLEntityResolverImpl()); + } catch (SAXNotRecognizedException e1) { + CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); //$NON-NLS-1$ + } catch (SAXNotSupportedException e1) { + CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); //$NON-NLS-1$ + } + + parserInstance.setContentHandler(handler); + parserInstance.setErrorHandler(handler); + return parserInstance; + } + + public SAXElement parse(InputStream input, IDocument document) { + InputSource s = new InputSource(input); + ConfigHanlder handler = new ConfigHanlder(document); + XMLReader reader = createParser1(handler); + try { + reader.parse(s); + } catch (IOException e) { + CommonPlugin.getDefault().logError(e); + } catch (SAXException e) { + CommonPlugin.getDefault().logError(e); + } + + return handler.getRootElement(); + } + + class ConfigHanlder extends DefaultHandler { + SAXElement root = null; + IDocument document; + Locator locator; + List<String> errors = new ArrayList<String>(); + SAXElement current = null; + + StringBuffer currentText = new StringBuffer(); + Location currentTextLocation = null; + + ConfigHanlder(IDocument document) { + this.document = document; + } + + public SAXElement getRootElement() { + return root; + } + + public void setDocumentLocator (Locator locator) { + this.locator = locator; + } + + private int getCurrentLocation() { + if (locator != null) { + int line = locator.getLineNumber() - 1; + int lineOffset = locator.getColumnNumber() - 1; + try { + return document.getLineOffset(line) + lineOffset; + } catch (BadLocationException e) { + CommonPlugin.getDefault().logError(e); + } + } + return 0; + } + + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + int end = getCurrentLocation(), start = 0; + if(end > 0) { + start = document.get().lastIndexOf("<", end); + } + SAXElement element = new SAXElement(); + element.setLocalName(localName); + element.setURI(uri); + element.setName(qName); + element.setParent(current); + if(start >= 0) { + element.setLocation(new Location(start, end - start)); + int ns = document.get().indexOf(qName, start); + if(ns >= start) { + element.setNameLocation(new Location(ns, qName.length())); + } + } + for (int i = 0; i < attributes.getLength(); i++) { + String n = attributes.getLocalName(i); + String v = attributes.getValue(i); + SAXAttribute a = new SAXAttribute(); + a.setName(n); + a.setValue(v); + int n_start = document.get().indexOf(n, start); + if(n_start >= 0) { + a.setNameLocation(new Location(n_start, n.length())); + int v_start = document.get().indexOf('"', n_start); + if(v_start >= 0) { + a.setValueLocation(new Location(v_start + 1, v.length())); + } + } + //TODO + element.addAttribute(a); + } + + current = element; + currentText = new StringBuffer(); + currentTextLocation = null; + if(root == null) root = element; + } + + public void characters (char ch[], int start, int length) throws SAXException { + String append = new String(ch, start, length); + if(append.trim().length() == 0) return; + int end = getCurrentLocation(), s = 0; + if (end > 0) { + s = end - length; + } + currentText.append(append); + currentTextLocation = new Location(s, length); + } + + public void endElement(String uri, String localName, String qName) throws SAXException { + int end = getCurrentLocation(); + if(end > 0) { + int start = document.get().lastIndexOf("<", end); + Location endLocation = new Location(start, end - start); + //TODO + } + if(currentText.length() > 0) { + SAXText text = new SAXText(); + text.setValue(currentText.toString()); + current.setTextNode(text); + text.setLocation(currentTextLocation); + currentText.setLength(0); + } + + if(current.getParent() != null) { + current.getParent().addChildElement(current); + } + + current = current.getParent(); + } + + + public void error(SAXParseException e) throws SAXException { + String message = e.getMessage(); + errors.add(message); + } + + public void fatalError(SAXParseException e) throws SAXException { + String message = e.getMessage(); + errors.add(message); + } + } + + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXText.java (from rev 30986, trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXText.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXText.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXText.java 2011-05-02 19:49:17 UTC (rev 31012) @@ -0,0 +1,29 @@ +/******************************************************************************* + * 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.xml; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SAXText extends SAXNode { + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXText.java ___________________________________________________________________ Added: svn:mime-type + text/plain