Author: akazakov Date: 2007-07-02 12:11:28 -0400 (Mon, 02 Jul 2007) New Revision: 2238 Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java Removed: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java 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/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/ISeamComponent.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/ISeamFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.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/internal/core/SeamComponent.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java Log: http://jira.jboss.com/jira/browse/EXIN-216 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -15,20 +15,9 @@ /** * @author Alexey Kazakov */ -public interface IBijectedAttribute { +public interface IBijectedAttribute extends ISeamSource, ISeamContextVariable { /** - * @return name - */ - public String getName(); - - /** - * Sets name - * @param name - */ - public void setName(String name); - - /** * @return type */ public BijectedAttributeType getType(); @@ -36,5 +25,5 @@ /** * @return java source element */ - public IMember getJavaElement(); + public IMember getJavaSource(); } \ No newline at end of file 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -10,45 +10,9 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import org.eclipse.core.resources.IFile; - /** * @author Alexey Kazakov */ -public interface IRole { +public interface IRole extends ISeamJavaClassSource, ISeamTextSource, ISeamContextVariable { - /** - * @return Name - */ - public String getName(); - - /** - * Sets name - */ - public void setName(String name); - - /** - * @return scope type - */ - public ScopeType getScope(); - - /** - * Sets scope type - */ - public void setScope(ScopeType type); - - /** - * @return source file - */ - public IFile getSourceFile(); - - /** - * @return start position in source file - */ - public int getStartPosition(); - - /** - * @return length role definition in source file. - */ - public int getLength(); } \ No newline at end of file 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -15,7 +15,7 @@ /** * @author Alexey Kazakov */ -public interface ISeamAnnotatedFactory extends ISeamFactory { +public interface ISeamAnnotatedFactory extends ISeamFactory, ISeamSource { /** * @return source IMethod Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -13,22 +13,9 @@ import java.util.List; import java.util.Set; -import org.eclipse.jdt.core.IType; +public interface ISeamComponent extends ISeamContextVariable { -public interface ISeamComponent extends ISeamModelObject { - /** - * @return Name - */ - public String getName(); - - /** - * Sets name - * @param name - */ - public void setName(String name); - - /** * @return qualified Class name of component */ public String getClassName(); @@ -40,17 +27,6 @@ public void setClassName(String className); /** - * @return scope type - */ - public ScopeType getScope(); - - /** - * Sets scope type - * @param type - */ - public void setScope(ScopeType type); - - /** * @return bijected attributes */ public Set<IBijectedAttribute> getBijectedAttributes(); @@ -84,58 +60,50 @@ * @param propertyName * @return */ - public List<ISeamProperty<? extends Object>> getProperties(String propertyName); + public List<ISeamProperty> getProperties(String propertyName); /** + * Returns first property with propertyName from component.xml for that component. + * @param propertyName + * @return + */ + public ISeamProperty getProperty(String propertyName); + + /** * Returns properties by name from component.xml. * @param propertyName * @return */ - public Set<ISeamProperty<? extends Object>> getProperties(); + public Set<ISeamProperty> getProperties(); /** * Adds property to component. * @param property */ - public void addProperty(ISeamProperty<? extends Object> property); + public void addProperty(ISeamProperty property); /** * Removes property from component. * @param property */ - public void removeProperty(ISeamProperty<? extends Object> property); + public void removeProperty(ISeamProperty property); /** - * @return Set of Java source classes + * @return sources */ - public Set<IType> getJavaSourceClasses(); + public Set<ISeamSource> getSourceDeclarations(); /** - * @param sourceClass + * @param source */ - public void addJavaSourceClass(IType sourceClass); + public void addSourceDeclaration(ISeamSource source); /** - * @param sourceClass + * Removes source */ - public void removeJavaSourceClass(IType sourceClass); + public void removeSourceDeclaration(ISeamSource source); /** - * @return Set of source xml elements - */ - public Set<ISeamXmlElement> getXmlSourceElements(); - - /** - * @param element - */ - public void addmlSourceElement(ISeamXmlElement element); - - /** - * @param element - */ - public void removemlSourceElement(ISeamXmlElement element); - - /** * @return true if component marked as Stateful */ public boolean isStateful(); @@ -196,19 +164,19 @@ public void removeMethod(ISeamComponentMethod method); /** - * @return Factories methods and xml elements of component + * @return Factories methods of component */ - public Set<ISeamFactory> getFactories(); + public Set<ISeamAnnotatedFactory> getFactories(); /** - * Adds factory method or xml element + * Adds factory method * @param factory */ - public void addFactory(ISeamFactory factory); + public void addFactory(ISeamAnnotatedFactory factory); /** - * Remove factory method or xml element + * Remove factory method * @param factory */ - public void removeFactory(ISeamFactory factory); + public void removeFactory(ISeamAnnotatedFactory factory); } \ No newline at end of file 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -15,7 +15,7 @@ /** * @author Alexey Kazakov */ -public interface ISeamComponentMethod { +public interface ISeamComponentMethod extends ISeamSource { /** * @return method type Copied: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java (from rev 2217, trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,39 @@ + /******************************************************************************* + * 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; + +/** + * @author Alexey Kazakov + */ +public interface ISeamContextVariable { + + /** + * @return name + */ + public String getName(); + + /** + * Sets name + * @param name + */ + public void setName(String name); + + /** + * @return scope type + */ + public ScopeType getScope(); + + /** + * Sets scope type + * @param type + */ + public void setScope(ScopeType type); +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -13,27 +13,6 @@ /** * @author Alexey Kazakov */ -public interface ISeamFactory { +public interface ISeamFactory extends ISeamContextVariable { - /** - * @return name - */ - public String getName(); - - /** - * Sets name - * @param name - */ - public void setName(String name); - - /** - * @return Scope type - */ - public ScopeType getScope(); - - /** - * Sets scope type - * @param type - */ - public void setScope(ScopeType type); } \ No newline at end of file Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,21 @@ + /******************************************************************************* + * 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.IType; + +/** + * @author Alexey Kazakov + */ +public interface ISeamJavaClassSource extends ISeamSource { + + public IType getSourceClass(); +} \ No newline at end of file Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -1,19 +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; - -public interface ISeamModelObject { - - /** - * @return ID of Model Object - */ - public String getId(); -} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -37,12 +37,6 @@ public Set<ISeamComponent> getComponentsByClass(String className); /** - * @param id of component. - * @return ISeamComponent by model object ID. - */ - public ISeamComponent getComponent(String modelObjectId); - - /** * @return Set of ISeamComponents */ public Set<ISeamComponent> getComponents(); @@ -62,17 +56,17 @@ /** * @return all seam variables from all contexts. */ - public Set<ISeamVariable> getVariables(); + public Set<ISeamContextVariable> getVariables(); /** * @param name * @return all seam variables by name from all contexts */ - public Set<ISeamVariable> getVariablesByName(String name); + public Set<ISeamContextVariable> getVariablesByName(String name); /** * @param name * @return all seam variables from specific context */ - public Set<ISeamVariable> getVariablesByScope(ScopeType scope); + public Set<ISeamContextVariable> getVariablesByScope(ScopeType scope); } \ 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -10,18 +10,25 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import org.eclipse.core.resources.IFile; - /** - * Seam Property defined in Component.xml + * Property of Seam Component defined in Component.xml or Properties.xml * @param <T> */ -public interface ISeamProperty<T extends Object> extends ISeamXmlElement { +public interface ISeamProperty extends ISeamTextSource { + /** + * @return name of property + */ public String getName(); - public T getValue(); - public String getStringValue(); + /** + * @return value of property + */ + public String getValue(); - public void setObject(Object value); + /** + * Sets value of property + * @param value + */ + public void setValue(String value); } \ No newline at end of file Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,19 @@ + /******************************************************************************* + * 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; + +/** + * @author Alexey Kazakov + * Represents source of ISeamModelObject + */ +public interface ISeamSource { + +} \ No newline at end of file Copied: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java (from rev 2215, trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,23 @@ + /******************************************************************************* + * 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.core.resources.IResource; + +/** + * @author Alexey Kazakov + */ +public interface ISeamTextSource extends ISeamSource { + + public IResource getResource(); + public int getStartPosition(); + public int getLength(); +} \ No newline at end of file Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -1,24 +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; - -/** - * @author Alexey Kazakov - */ -public interface ISeamVariable { - - /** - * @return name - */ - public String getName(); - -// TODO we should hold a link to source object (IBijectedAttribute, ISeamComponent, etc.) -} \ No newline at end of file Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -1,24 +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.core.resources.IResource; - -/** - * @author Alexey Kazakov - * TODO should we use WTP's stuff instead? - */ -public interface ISeamXmlElement { - - public IResource getResource(); - public int getStartPosition(); - public int getLength(); -} \ No newline at end of file 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -13,7 +13,7 @@ /** * @author Alexey Kazakov */ -public interface ISeamXmlFactory extends ISeamFactory, ISeamXmlElement { +public interface ISeamXmlFactory extends ISeamFactory, ISeamTextSource { /** * @return value 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -16,20 +16,19 @@ import java.util.Set; import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.IType; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute; import org.jboss.tools.seam.core.IRole; +import org.jboss.tools.seam.core.ISeamAnnotatedFactory; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentMethod; -import org.jboss.tools.seam.core.ISeamFactory; import org.jboss.tools.seam.core.ISeamProperty; -import org.jboss.tools.seam.core.ISeamXmlElement; +import org.jboss.tools.seam.core.ISeamSource; import org.jboss.tools.seam.core.ScopeType; import org.jboss.tools.seam.core.SeamComponentMethodType; public class SeamComponent implements ISeamComponent { - protected Map<String,ISeamProperty<? extends Object>> properties = new HashMap<String, ISeamProperty<? extends Object>>(); + protected Map<String,ISeamProperty> properties = new HashMap<String, ISeamProperty>(); protected IPath source; public SeamComponent () { @@ -40,7 +39,7 @@ } public boolean getBooleanProperty(String propertyName) { - ISeamProperty<?> o = getProperty(propertyName); + ISeamProperty o = getProperty(propertyName); Object value = o.getValue(); if(value instanceof Boolean) return ((Boolean)value).booleanValue(); if(value instanceof String && "true".equals(value)); @@ -48,25 +47,25 @@ } public String getStringProperty(String propertyName) { - ISeamProperty<?> o = getProperty(propertyName); + ISeamProperty o = getProperty(propertyName); Object value = o.getValue(); return value == null ? null : value.toString(); } - public ISeamProperty<? extends Object> getProperty(String propertyName) { + public ISeamProperty getProperty(String propertyName) { return properties.get(propertyName); } - public void addProperty(ISeamProperty<? extends Object> property) { + public void addProperty(ISeamProperty property) { properties.put(property.getName(), property); } public void setStringProperty(String propertyName, String value) { - ISeamProperty<? extends Object> p = getProperty(propertyName); + ISeamProperty p = getProperty(propertyName); if(p == null) { - p = new SeamProperty<String>(propertyName, value); + p = new SeamProperty(propertyName, value); } else { - p.setObject(value); + p.setValue(value); } properties.put(propertyName, p); } @@ -75,30 +74,47 @@ source = path; } - /** - * @return ID of Seam Component. It's unique within Project. + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.ISeamComponent#addBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) */ - public String getId() { - return getClassName() + ":" + getName(); + public void addBijectedAttribute(IBijectedAttribute attribute) { + // TODO Auto-generated method stub + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) + * @see org.jboss.tools.seam.core.ISeamComponent#addFactory(org.jboss.tools.seam.core.ISeamAnnotatedFactory) */ - public void addBijectedAttribute(IBijectedAttribute attribute) { + public void addFactory(ISeamAnnotatedFactory factory) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addJavaSourceClass(org.eclipse.jdt.core.IType) + * @see org.jboss.tools.seam.core.ISeamComponent#addMethod(org.jboss.tools.seam.core.ISeamComponentMethod) */ - public void addJavaSourceClass(IType sourceClass) { + public void addMethod(ISeamComponentMethod method) { // TODO Auto-generated method stub } /* (non-Javadoc) + * @see org.jboss.tools.seam.core.ISeamComponent#addRole(org.jboss.tools.seam.core.IRole) + */ + public void addRole(IRole role) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.ISeamComponent#addSourceDeclaration(org.jboss.tools.seam.core.ISeamSource) + */ + public void addSourceDeclaration(ISeamSource source) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamComponent#getBijectedAttributes() */ public Set<IBijectedAttribute> getBijectedAttributes() { @@ -131,216 +147,179 @@ return null; } - public void setClassName(String name) { - // TODO Auto-generated method stub - } - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getJavaSourceClasses() + * @see org.jboss.tools.seam.core.ISeamComponent#getFactories() */ - public Set<IType> getJavaSourceClasses() { + public Set<ISeamAnnotatedFactory> getFactories() { // TODO Auto-generated method stub return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getName() + * @see org.jboss.tools.seam.core.ISeamComponent#getMethods() */ - public String getName() { + public Set<ISeamComponentMethod> getMethods() { // TODO Auto-generated method stub return null; } - public void setName(String name) { - // TODO Auto-generated method stub - } - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getProperties(java.lang.String) + * @see org.jboss.tools.seam.core.ISeamComponent#getMethodsByType(org.jboss.tools.seam.core.SeamComponentMethodType) */ - public List<ISeamProperty<? extends Object>> getProperties( - String propertyName) { + public Set<ISeamComponentMethod> getMethodsByType( + SeamComponentMethodType type) { // TODO Auto-generated method stub return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getProperties() + * @see org.jboss.tools.seam.core.ISeamComponent#getRoles() */ - public Set<ISeamProperty<? extends Object>> getProperties() { + public Set<IRole> getRoles() { // TODO Auto-generated method stub return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getScope() + * @see org.jboss.tools.seam.core.ISeamComponent#getSourceDeclarations() */ - public ScopeType getScope() { + public Set<ISeamSource> getSourceDeclarations() { // TODO Auto-generated method stub return null; } - public void setScope(ScopeType scope) { - // TODO Auto-generated method stub - } - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getXmlSourceElements() + * @see org.jboss.tools.seam.core.ISeamComponent#isEntity() */ - public Set<ISeamXmlElement> getXmlSourceElements() { + public boolean isEntity() { // TODO Auto-generated method stub - return null; + return false; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addFactory(org.jboss.tools.seam.core.ISeamFactory) + * @see org.jboss.tools.seam.core.ISeamComponent#isStateful() */ - public void addFactory(ISeamFactory factory) { + public boolean isStateful() { // TODO Auto-generated method stub - + return false; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addMethod(org.jboss.tools.seam.core.ISeamComponentMethod) + * @see org.jboss.tools.seam.core.ISeamComponent#removeBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) */ - public void addMethod(ISeamComponentMethod method) { + public void removeBijectedAttribute(IBijectedAttribute attribute) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addRole(org.jboss.tools.seam.core.IRole) + * @see org.jboss.tools.seam.core.ISeamComponent#removeFactory(org.jboss.tools.seam.core.ISeamAnnotatedFactory) */ - public void addRole(IRole role) { + public void removeFactory(ISeamAnnotatedFactory factory) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addmlSourceElement(org.jboss.tools.seam.core.ISeamXmlElement) + * @see org.jboss.tools.seam.core.ISeamComponent#removeMethod(org.jboss.tools.seam.core.ISeamComponentMethod) */ - public void addmlSourceElement(ISeamXmlElement element) { + public void removeMethod(ISeamComponentMethod method) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getFactories() + * @see org.jboss.tools.seam.core.ISeamComponent#removeRole(org.jboss.tools.seam.core.IRole) */ - public Set<ISeamFactory> getFactories() { + public void removeRole(IRole role) { // TODO Auto-generated method stub - return null; + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getMethods() + * @see org.jboss.tools.seam.core.ISeamComponent#removeSourceDeclaration(org.jboss.tools.seam.core.ISeamSource) */ - public Set<ISeamComponentMethod> getMethods() { + public void removeSourceDeclaration(ISeamSource source) { // TODO Auto-generated method stub - return null; + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getMethodsByType(org.jboss.tools.seam.core.SeamComponentMethodType) + * @see org.jboss.tools.seam.core.ISeamComponent#setClassName(java.lang.String) */ - public Set<ISeamComponentMethod> getMethodsByType( - SeamComponentMethodType type) { + public void setClassName(String className) { // TODO Auto-generated method stub - return null; + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getRoles() + * @see org.jboss.tools.seam.core.ISeamComponent#setEntity(boolean) */ - public Set<IRole> getRoles() { + public void setEntity(boolean entity) { // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#isEntity() - */ - public boolean isEntity() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#isStateful() - */ - public boolean isStateful() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) - */ - public void removeBijectedAttribute(IBijectedAttribute attribute) { - // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeFactory(org.jboss.tools.seam.core.ISeamFactory) + * @see org.jboss.tools.seam.core.ISeamComponent#setStateful(boolean) */ - public void removeFactory(ISeamFactory factory) { + public void setStateful(boolean stateful) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeJavaSourceClass(org.eclipse.jdt.core.IType) + * @see org.jboss.tools.seam.core.ISeamContextVariable#getName() */ - public void removeJavaSourceClass(IType sourceClass) { + public String getName() { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeMethod(org.jboss.tools.seam.core.ISeamComponentMethod) + * @see org.jboss.tools.seam.core.ISeamContextVariable#getScope() */ - public void removeMethod(ISeamComponentMethod method) { + public ScopeType getScope() { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeProperty(org.jboss.tools.seam.core.ISeamProperty) + * @see org.jboss.tools.seam.core.ISeamContextVariable#setName(java.lang.String) */ - public void removeProperty(ISeamProperty<? extends Object> property) { + public void setName(String name) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeRole(org.jboss.tools.seam.core.IRole) + * @see org.jboss.tools.seam.core.ISeamContextVariable#setScope(org.jboss.tools.seam.core.ScopeType) */ - public void removeRole(IRole role) { + public void setScope(ScopeType type) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removemlSourceElement(org.jboss.tools.seam.core.ISeamXmlElement) + * @see org.jboss.tools.seam.core.ISeamComponent#getProperties(java.lang.String) */ - public void removemlSourceElement(ISeamXmlElement element) { + public List<ISeamProperty> getProperties(String propertyName) { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#setEntity(boolean) + * @see org.jboss.tools.seam.core.ISeamComponent#getProperties() */ - public void setEntity(boolean entity) { + public Set<ISeamProperty> getProperties() { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#setStateful(boolean) + * @see org.jboss.tools.seam.core.ISeamComponent#removeProperty(org.jboss.tools.seam.core.ISeamProperty) */ - public void setStateful(boolean stateful) { + public void removeProperty(ISeamProperty property) { // TODO Auto-generated method stub } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IPath; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamProject; -import org.jboss.tools.seam.core.ISeamVariable; +import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ScopeType; /** @@ -152,7 +152,7 @@ /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamProject#getVariables() */ - public Set<ISeamVariable> getVariables() { + public Set<ISeamContextVariable> getVariables() { // TODO Auto-generated method stub return null; } @@ -160,7 +160,7 @@ /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamProject#getVariablesByName(java.lang.String) */ - public Set<ISeamVariable> getVariablesByName(String name) { + public Set<ISeamContextVariable> getVariablesByName(String name) { // TODO Auto-generated method stub return null; } @@ -168,7 +168,7 @@ /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamProject#getVariablesByScope(org.jboss.tools.seam.core.ScopeType) */ - public Set<ISeamVariable> getVariablesByScope(ScopeType scope) { + public Set<ISeamContextVariable> getVariablesByScope(ScopeType scope) { // TODO Auto-generated method stub return null; } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -10,23 +10,22 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.jboss.tools.seam.core.ISeamProperty; -public class SeamProperty<T extends Object> implements ISeamProperty<T> { +public class SeamProperty implements ISeamProperty { protected String name; - protected T value; + protected String value; protected int startPosition = -1; protected int length = -1; - + public SeamProperty() {} - + public SeamProperty(String name) { this.name = name; } - public SeamProperty(String name, T value) { + public SeamProperty(String name, String value) { this.name = name; this.value = value; } @@ -51,23 +50,14 @@ length = v; } - public String getStringValue() { - Object value = getValue(); - return value == null ? null : value.toString(); - } - - public T getValue() { + public String getValue() { return value; } - public void setValue(T value) { + public void setValue(String value) { this.value = value; } - public void setObject(Object value) { - this.value = (T)value; - } - /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamXmlElement#getResource() */ Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -22,9 +22,7 @@ import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.internal.core.SeamComponent; -import org.jboss.tools.seam.internal.core.SeamProperty; import org.jboss.tools.seam.internal.core.scanner.IFileScanner; public class XMLScanner implements IFileScanner { @@ -128,7 +126,7 @@ for (int k = 0; k < entries.length; k++) { listValues.add(entries[k].getAttributeValue("value")); } - component.addProperty(new SeamProperty<List<String>>(propertyName, listValues)); +// component.addProperty(new SeamProperty<List<String>>(propertyName, listValues)); } else { //this is map value Map<String,String> mapValues = new HashMap<String, String>(); @@ -137,7 +135,7 @@ String entryValue = entries[k].getAttributeValue("value"); mapValues.put(entryKey, entryValue); } - component.addProperty(new SeamProperty<Map<String,String>>(propertyName, mapValues)); +// component.addProperty(new SeamProperty<Map<String,String>>(propertyName, mapValues)); } } //TODO assign positioning attributes to created ISeamProperty object @@ -157,8 +155,7 @@ list.add(component); } } - + return list.toArray(new SeamComponent[0]); } - -} +} \ No newline at end of file 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 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -89,9 +89,9 @@ for (Iterator iterator = components.iterator(); iterator.hasNext();) { ISeamComponent c = (ISeamComponent) iterator.next(); //We have list property in this component - List<ISeamProperty<?>> prs = c.getProperties("myList"); + List<ISeamProperty> prs = c.getProperties("myList"); assertTrue("Property myList is not found in components.xml", prs.size() == 1); - ISeamProperty<?> property = prs.get(0); + ISeamProperty property = prs.get(0); Object o = property.getValue(); assertTrue("Property myList in myComponent must be instanceof java.util.List.", o instanceof List); List<?> oList = (List<?>)o;