Author: kentam Date: Fri Jan 14 13:15:07 2005 New Revision: 125208 URL: http://svn.apache.org/viewcvs?view=rev&rev=125208 Log: Controls.instantiate() is the recommended way to create control bean instances -- generated client initializers now use it rather than directly calling control bean constructors.
Removed some dead code. DRT: windows all Removed: incubator/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/JndiService.java incubator/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/impl/ Modified: incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm Modified: incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm?view=diff&rev=125208&p1=incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm&r1=125207&p2=incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm&r2=125208 ============================================================================== --- incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm (original) +++ incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm Fri Jan 14 13:15:07 2005 @@ -108,7 +108,7 @@ #macro (initControl $control) $control.controlBean.className $control.localName = ($control.controlBean.className)cbc.getBean("$control.name"); if ($control.localName == null) - $control.localName = new ${control.controlBean.className}(cbc, "$control.name", getAnnotationMap(cbc, ${control.reflectField})); + $control.localName = (${control.controlBean.className}) Controls.instantiate( null, "${control.controlBean.className}", getAnnotationMap(cbc, ${control.reflectField}), cbc, "$control.name" ); #initEventAdaptors($control) #if ($init.needsReflection($control)) ${control.reflectField}.set(client, $control.localName); @@ -152,6 +152,7 @@ import java.lang.reflect.Field; import org.apache.beehive.controls.api.ControlException; +import org.apache.beehive.controls.api.bean.Controls; import org.apache.beehive.controls.api.context.ControlBeanContext; import org.apache.beehive.controls.runtime.bean.ControlBean; import org.apache.beehive.controls.runtime.bean.EventAdaptor; Deleted: /incubator/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/JndiService.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/JndiService.java?view=auto&rev=125207 ==============================================================================
