Author: scabanovich Date: 2007-07-18 11:01:45 -0400 (Wed, 18 Jul 2007) New Revision: 2504 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassScanner.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java Log: EXIN-217 getScope() method overrided for SeamAnnotatedFactory Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java 2007-07-18 14:46:20 UTC (rev 2503) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractContextVariable.java 2007-07-18 15:01:45 UTC (rev 2504) @@ -50,10 +50,10 @@ } public void setScopeAsString(String scope) { + if(scope != null && scope.indexOf('.') > 0) { + scope = scope.substring(scope.lastIndexOf('.')); + } try { - if(scope != null && scope.indexOf('.') > 0) { - scope = scope.substring(scope.lastIndexOf('.')); - } this.scopeType = scope == null || scope.length() == 0 ? ScopeType.UNSPECIFIED : ScopeType.valueOf(scope.toUpperCase()); } catch (Exception e) { //ignore Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java 2007-07-18 14:46:20 UTC (rev 2503) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamAnnotatedFactory.java 2007-07-18 15:01:45 UTC (rev 2504) @@ -23,8 +23,10 @@ * @author Viacheslav Kabanovich */ public class SeamAnnotatedFactory extends SeamJavaContextVariable implements ISeamAnnotatedFactory { - + SeamJavaComponentDeclaration parentDeclaration = null; boolean autoCreate = false; + + public SeamAnnotatedFactory() {} public IMethod getSourceMethod() { return (IMethod)javaSource; @@ -56,28 +58,18 @@ } @Override - public void setScope(ScopeType scope) { - if(scope==null) { - this.scopeType = ScopeType.EVENT; - } else { - super.setScope(scope); - } - } - - @Override public ScopeType getScope() { - if(scope==null) { - return ScopeType.EVENT; + ScopeType value = super.getScope(); + if(value == null || value == ScopeType.UNSPECIFIED) { + if(parentDeclaration != null) value = parentDeclaration.getScope(); } - return super.getScope(); + if(value == null || value == ScopeType.UNSPECIFIED) { + value = ScopeType.EVENT; + } + return value; } - @Override - public void setScopeAsString(String scope) { - if(scope==null) { - this.scopeType = ScopeType.EVENT; - } else { - super.setScopeAsString(scope); - } + public void setParentDeclaration(SeamJavaComponentDeclaration parentDeclaration) { + this.parentDeclaration = parentDeclaration; } } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2007-07-18 14:46:20 UTC (rev 2503) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2007-07-18 15:01:45 UTC (rev 2504) @@ -123,6 +123,7 @@ ValueInfo autoCreate = ValueInfo.getValueInfo(a, "autoCreate"); SeamAnnotatedFactory factory = new SeamAnnotatedFactory(); + factory.setParentDeclaration(component); IMethod im = findMethod(m); factory.setSourceMember(im); factory.setId(im); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassScanner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassScanner.java 2007-07-18 14:46:20 UTC (rev 2503) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassScanner.java 2007-07-18 15:01:45 UTC (rev 2504) @@ -175,6 +175,7 @@ name = m.getName(); } SeamAnnotatedFactory factory = new SeamAnnotatedFactory(); + factory.setParentDeclaration(component); ds.getFactories().add(factory); IMethod im = findIMethod(component, m); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2007-07-18 14:46:20 UTC (rev 2503) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2007-07-18 15:01:45 UTC (rev 2504) @@ -186,6 +186,7 @@ name = new String(m.getSelector()); } SeamAnnotatedFactory factory = new SeamAnnotatedFactory(); + factory.setParentDeclaration(component); ds.getFactories().add(factory); IMethod im = findIMethod(component, m);