[jboss-cvs] JBossAS SVN: r71175 - projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 23 09:46:35 EDT 2008
Author: alesj
Date: 2008-03-23 09:46:34 -0400 (Sun, 23 Mar 2008)
New Revision: 71175
Added:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateActionBuilder.java
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java
Log:
Expose single method for installs, callbacks.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java 2008-03-23 03:11:06 UTC (rev 71174)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java 2008-03-23 13:46:34 UTC (rev 71175)
@@ -88,22 +88,22 @@
private LifecycleMetaDataBuilder destroyBuilder;
/** The install builder */
- private AbstractInstallMetaDataBuilder installBuilder;
+ private StateActionBuilder<AbstractInstallMetaData> installBuilder;
/** The uninstall builder */
- private AbstractInstallMetaDataBuilder uninstallBuilder;
+ private StateActionBuilder<AbstractInstallMetaData> uninstallBuilder;
/** The incallback builder */
- private AbstractCallbackMetaDataBuilder propIncallbackBuilder;
+ private StateActionBuilder<AbstractCallbackMetaData> propIncallbackBuilder;
/** The uncallback builder */
- private AbstractCallbackMetaDataBuilder propUncallbackBuilder;
+ private StateActionBuilder<AbstractCallbackMetaData> propUncallbackBuilder;
/** The incallback builder */
- private AbstractCallbackMetaDataBuilder incallbackBuilder;
+ private StateActionBuilder<AbstractCallbackMetaData> incallbackBuilder;
/** The uncallback builder */
- private AbstractCallbackMetaDataBuilder uncallbackBuilder;
+ private StateActionBuilder<AbstractCallbackMetaData> uncallbackBuilder;
/**
* Create a new BeanMetaDataBuilderImpl.
@@ -330,7 +330,7 @@
public BeanMetaDataBuilder setCreate(String methodName)
{
- createBuilder.createLifecycleMetaData(methodName);
+ createBuilder.createStateActionMetaData(methodName);
return this;
}
@@ -354,7 +354,7 @@
public BeanMetaDataBuilder setStart(String methodName)
{
- startBuilder.createLifecycleMetaData(methodName);
+ startBuilder.createStateActionMetaData(methodName);
return this;
}
@@ -378,7 +378,7 @@
public BeanMetaDataBuilder setStop(String methodName)
{
- stopBuilder.createLifecycleMetaData(methodName);
+ stopBuilder.createStateActionMetaData(methodName);
return this;
}
@@ -402,7 +402,7 @@
public BeanMetaDataBuilder setDestroy(String methodName)
{
- destroyBuilder.createLifecycleMetaData(methodName);
+ destroyBuilder.createStateActionMetaData(methodName);
return this;
}
@@ -470,7 +470,7 @@
public ParameterMetaDataBuilder addInstallWithParameters(String methodName, String bean, ControllerState state, ControllerState whenRequired)
{
- AbstractInstallMetaData install = installBuilder.createLifecycleMetaData(methodName);
+ AbstractInstallMetaData install = installBuilder.createStateActionMetaData(methodName);
install.setBean(bean);
if (state != null)
install.setDependentState(state);
@@ -481,7 +481,7 @@
public ParameterMetaDataBuilder addUninstallWithParameters(String methodName, String bean, ControllerState state, ControllerState whenRequired)
{
- AbstractInstallMetaData uninstall = uninstallBuilder.createLifecycleMetaData(methodName);
+ AbstractInstallMetaData uninstall = uninstallBuilder.createStateActionMetaData(methodName);
uninstall.setBean(bean);
if (state != null)
uninstall.setDependentState(state);
@@ -492,7 +492,7 @@
public BeanMetaDataBuilder addPropertyInstallCallback(String property, String signature, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality)
{
- AbstractCallbackMetaData callback = propIncallbackBuilder.createLifecycleMetaData(property);
+ AbstractCallbackMetaData callback = propIncallbackBuilder.createStateActionMetaData(property);
callback.setSignature(signature);
callback.setState(whenRequired);
if (dependentState != null)
@@ -503,7 +503,7 @@
public BeanMetaDataBuilder addPropertyUninstallCallback(String property, String signature, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality)
{
- AbstractCallbackMetaData callback = propUncallbackBuilder.createLifecycleMetaData(property);
+ AbstractCallbackMetaData callback = propUncallbackBuilder.createStateActionMetaData(property);
callback.setSignature(signature);
callback.setState(whenRequired);
if (dependentState != null)
@@ -514,7 +514,7 @@
public BeanMetaDataBuilder addMethodInstallCallback(String method, String signature, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality)
{
- AbstractCallbackMetaData callback = incallbackBuilder.createLifecycleMetaData(method);
+ AbstractCallbackMetaData callback = incallbackBuilder.createStateActionMetaData(method);
callback.setSignature(signature);
callback.setState(whenRequired);
if (dependentState != null)
@@ -525,7 +525,7 @@
public BeanMetaDataBuilder addMethodUninstallCallback(String method, String signature, ControllerState whenRequired, ControllerState dependentState, Cardinality cardinality)
{
- AbstractCallbackMetaData callback = uncallbackBuilder.createLifecycleMetaData(method);
+ AbstractCallbackMetaData callback = uncallbackBuilder.createStateActionMetaData(method);
callback.setSignature(signature);
callback.setState(whenRequired);
if (dependentState != null)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java 2008-03-23 03:11:06 UTC (rev 71174)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/LifecycleMetaDataBuilder.java 2008-03-23 13:46:34 UTC (rev 71175)
@@ -64,7 +64,7 @@
LifecycleMetaData lifecycle = getLifecycle(beanMetaData);
if (lifecycle == null)
{
- createLifecycleMetaData(null);
+ createStateActionMetaData(null);
}
}
Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateActionBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateActionBuilder.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateActionBuilder.java 2008-03-23 13:46:34 UTC (rev 71175)
@@ -0,0 +1,42 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.beans.metadata.plugins.builder;
+
+import org.jboss.beans.metadata.spi.LifecycleMetaData;
+
+/**
+ * State action builder.
+ * e.g. lifecycle, install and callback
+ *
+ * @param <T> exact state action metadata type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface StateActionBuilder<T extends LifecycleMetaData>
+{
+ /**
+ * Create state action meta data.
+ *
+ * @param methodInfo the method info
+ * @return state action meta data
+ */
+ T createStateActionMetaData(String methodInfo);
+}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java 2008-03-23 03:11:06 UTC (rev 71174)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/StateMetaDataBuilder.java 2008-03-23 13:46:34 UTC (rev 71175)
@@ -33,7 +33,7 @@
* @param <T> exact type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public abstract class StateMetaDataBuilder<T extends LifecycleMetaData>
+public abstract class StateMetaDataBuilder<T extends LifecycleMetaData> implements StateActionBuilder<T>
{
/** The bean meta data */
protected AbstractBeanMetaData beanMetaData;
@@ -65,13 +65,7 @@
*/
protected abstract void applyAfterSet(T lifecycle);
- /**
- * Create lifecycle meta data.
- *
- * @param methodInfo the method info
- * @return lifecycle meta data
- */
- public T createLifecycleMetaData(String methodInfo)
+ public T createStateActionMetaData(String methodInfo)
{
T lifecycle = createLifecycleMetaData();
if (methodInfo != null)
@@ -84,7 +78,7 @@
}
/**
- * Set the methid info.
+ * Set the method info.
*
* @param lifecycle the lifecycle
* @param methodInfo the method info
More information about the jboss-cvs-commits
mailing list