[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...
Gavin King
gavin.king at jboss.com
Thu Nov 16 21:35:45 EST 2006
User: gavin
Date: 06/11/16 21:35:45
Modified: src/main/org/jboss/seam Component.java components-1.1.dtd
Log:
auto-create JBSEAM-385
Revision Changes Path
1.211 +13 -1 jboss-seam/src/main/org/jboss/seam/Component.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Component.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- Component.java 16 Nov 2006 17:25:03 -0000 1.210
+++ Component.java 17 Nov 2006 02:35:45 -0000 1.211
@@ -120,7 +120,7 @@
*
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
* @author Gavin King
- * @version $Revision: 1.210 $
+ * @version $Revision: 1.211 $
*/
@Scope(ScopeType.APPLICATION)
@SuppressWarnings("deprecation")
@@ -1546,6 +1546,11 @@
return getInstance( Seam.getComponentName(clazz), create );
}
+ public static Object getInstance(Class<?> clazz, ScopeType scope)
+ {
+ return getInstance(clazz, scope, true);
+ }
+
public static Object getInstance(Class<?> clazz, ScopeType scope, boolean create)
{
return getInstance( Seam.getComponentName(clazz), scope, create );
@@ -1563,6 +1568,11 @@
return result;
}
+ public static Object getInstance(String name, ScopeType scope)
+ {
+ return getInstance(name, scope, true);
+ }
+
public static Object getInstance(String name, ScopeType scope, boolean create)
{
Object result = scope==STATELESS ? null : scope.getContext().get(name);
@@ -1573,6 +1583,8 @@
private static Object getInstance(String name, boolean create, Object result) {
Component component = Component.forName(name);
+ create = create || Init.instance().isAutocreateVariable(name);
+
if (result==null && create)
{
result = getInstanceFromFactory(name);
1.3 +2 -0 jboss-seam/src/main/org/jboss/seam/components-1.1.dtd
(In the diff below, changes in quantity of whitespace are not shown.)
Index: components-1.1.dtd
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/components-1.1.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- components-1.1.dtd 13 Nov 2006 17:33:02 -0000 1.2
+++ components-1.1.dtd 17 Nov 2006 02:35:45 -0000 1.3
@@ -14,12 +14,14 @@
<!ATTLIST component scope (stateless|request|page|conversation|session|business_process|application|STATELESS|REQUEST|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED>
<!ATTLIST component jndi-name CDATA #IMPLIED>
<!ATTLIST component installed CDATA "true">
+<!ATTLIST component auto-create (true|false) "false">
<!ELEMENT factory EMPTY>
<!ATTLIST factory name CDATA #REQUIRED>
<!ATTLIST factory method CDATA #IMPLIED>
<!ATTLIST factory value CDATA #IMPLIED>
<!ATTLIST factory scope (stateless|request|page|conversation|session|business_process|application|STATELESS|REQUEST|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED>
+<!ATTLIST factory auto-create (true|false) "false">
<!ELEMENT property (#PCDATA|key|value)*>
<!ATTLIST property name CDATA #REQUIRED>
More information about the jboss-cvs-commits
mailing list