Author: scabanovich Date: 2007-07-03 12:55:05 -0400 (Tue, 03 Jul 2007) New Revision: 2263 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/SeamJavaComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java Log: EXIN-217 Implementation corrected after moving factories to project. 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-03 16:48:03 UTC (rev 2262) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2007-07-03 16:55:05 UTC (rev 2263) @@ -19,7 +19,6 @@ 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.ISeamComponentDeclaration; import org.jboss.tools.seam.core.ISeamComponentMethod; @@ -81,14 +80,6 @@ } /** - * @see org.jboss.tools.seam.core.ISeamComponent#getFactories() - */ - public Set<ISeamAnnotatedFactory> getFactories() { - ISeamJavaComponentDeclaration javaDeclaration = getJavaDeclaration(); - return (javaDeclaration == null) ? null : javaDeclaration.getFactories(); - } - - /** * @see org.jboss.tools.seam.core.ISeamComponent#getMethods() */ public Set<ISeamComponentMethod> getMethods() { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-07-03 16:48:03 UTC (rev 2262) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-07-03 16:55:05 UTC (rev 2263) @@ -21,7 +21,6 @@ protected boolean entity = false; protected Set<IBijectedAttribute> bijectedAttributes = new HashSet<IBijectedAttribute>(); - protected Set<ISeamAnnotatedFactory> annotatedFactories = new HashSet<ISeamAnnotatedFactory>(); protected Set<ISeamComponentMethod> componentMethods = new HashSet<ISeamComponentMethod>(); protected Set<IRole> roles = new HashSet<IRole>(); @@ -37,10 +36,6 @@ bijectedAttributes.add(attribute); } - public void addFactory(ISeamAnnotatedFactory factory) { - annotatedFactories.add(factory); - } - public void addMethod(ISeamComponentMethod method) { componentMethods.add(method); } @@ -76,10 +71,6 @@ return result; } - public Set<ISeamAnnotatedFactory> getFactories() { - return annotatedFactories; - } - public Set<ISeamComponentMethod> getMethods() { return componentMethods; } @@ -112,10 +103,6 @@ bijectedAttributes.remove(attribute); } - public void removeFactory(ISeamAnnotatedFactory factory) { - annotatedFactories.remove(factory); - } - public void removeMethod(ISeamComponentMethod method) { componentMethods.remove(method); } 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-03 16:48:03 UTC (rev 2262) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-07-03 16:55:05 UTC (rev 2263) @@ -17,8 +17,10 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.jboss.tools.seam.core.ISeamAnnotatedFactory; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentDeclaration; +import org.jboss.tools.seam.core.ISeamFactory; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ScopeType; @@ -29,6 +31,7 @@ public class SeamProject implements ISeamProject { IProject project; Set<SeamComponent> allComponents = new HashSet<SeamComponent>(); + protected Set<ISeamFactory> allFactories = new HashSet<ISeamFactory>(); Set<ISeamContextVariable> allVariables = new HashSet<ISeamContextVariable>(); public SeamProject() {} @@ -82,7 +85,7 @@ if(list == null) return; //TODO for (int i = 0; i < list.length; i++) { -// list[i].setSourcePath(source); + list[i].setSourcePath(source); //TODO !!! // allComponents.add(list[i]); @@ -191,4 +194,40 @@ return result; } + public void addFactory(ISeamFactory factory) { + allFactories.add(factory); + } + + public Set<ISeamFactory> getFactories() { + return allFactories; + } + + public Set<ISeamFactory> getFactories(String name, ScopeType scope) { + Set<ISeamFactory> result = new HashSet<ISeamFactory>(); + for (ISeamFactory f: allFactories) { + if(name.equals(f.getName()) && scope.equals(f.getScope())) result.add(f); + } + return result; + } + + public Set<ISeamFactory> getFactoriesByName(String name) { + Set<ISeamFactory> result = new HashSet<ISeamFactory>(); + for (ISeamFactory f: allFactories) { + if(name.equals(f.getName())) result.add(f); + } + return result; + } + + public Set<ISeamFactory> getFactoriesByScope(ScopeType scope) { + Set<ISeamFactory> result = new HashSet<ISeamFactory>(); + for (ISeamFactory f: allFactories) { + if(scope.equals(f.getScope())) result.add(f); + } + return result; + } + + public void removeFactory(ISeamFactory factory) { + allFactories.remove(factory); + } + }