[jboss-cvs] JBossAS SVN: r84642 - in projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop: plugins and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 23 11:18:40 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-02-23 11:18:39 -0500 (Mon, 23 Feb 2009)
New Revision: 84642
Modified:
projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java
projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java
projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java
Log:
Make the Manager.removeXXX() methods return the removed item
Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java 2009-02-23 16:18:37 UTC (rev 84641)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java 2009-02-23 16:18:39 UTC (rev 84642)
@@ -61,9 +61,9 @@
}
}
- public void removeLifecycleDefinition(String name)
+ public AspectDefinition removeLifecycleDefinition(String name)
{
- lifecycles.remove(name);
+ return lifecycles.remove(name);
}
public void addLifecycleBinding(LifecycleCallbackBinding lifecycleBinding)
@@ -71,9 +71,9 @@
lifecycleBindings.put(lifecycleBinding.getName(), lifecycleBinding);
}
- public void removeLifecycleBinding(String name)
+ public LifecycleCallbackBinding removeLifecycleBinding(String name)
{
- lifecycleBindings.remove(name);
+ return lifecycleBindings.remove(name);
}
public Map<String, LifecycleCallbackBinding> getLifecycleBindings()
Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java 2009-02-23 16:18:37 UTC (rev 84641)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java 2009-02-23 16:18:39 UTC (rev 84642)
@@ -108,9 +108,9 @@
return cflowStacks.get(name);
}
- public void removeCFlowStack(String name)
+ public CFlowStack removeCFlowStack(String name)
{
- cflowStacks.remove(name);
+ return cflowStacks.remove(name);
}
public Map<String, CFlowStack> getCFlowStacks()
@@ -135,9 +135,9 @@
return null;
}
- public void removeDynamicCFlow(String name)
+ public DynamicCFlowDefinition removeDynamicCFlow(String name)
{
- dynamicCFlows.remove(name);
+ return dynamicCFlows.remove(name);
}
public Map<String, DynamicCFlowDefinition> getDynamicCFlows()
@@ -151,9 +151,9 @@
typedefs.put(def.getName(), def);
}
- public void removeTypedef(String name)
+ public Typedef removeTypedef(String name)
{
- typedefs.remove(name);
+ return typedefs.remove(name);
}
public Typedef getTypedef(String name)
@@ -183,11 +183,11 @@
}
}
- public void removeInterceptorFactory(String name)
+ public InterceptorFactory removeInterceptorFactory(String name)
{
synchronized (interceptorFactories)
{
- interceptorFactories.remove(name);
+ return interceptorFactories.remove(name);
}
}
@@ -214,13 +214,14 @@
}
}
- public void removeInterfaceIntroduction(String name)
+ public InterfaceIntroduction removeInterfaceIntroduction(String name)
{
synchronized (interfaceIntroductions)
{
InterfaceIntroduction pointcut = interfaceIntroductions.remove(name);
- if (pointcut == null) return;
+ if (pointcut == null) return null;
pointcut.clearAdvisors();
+ return pointcut;
}
}
@@ -242,9 +243,9 @@
return loader;
}
- public void removeClassMetaDataLoader(String group)
+ public ClassMetaDataLoader removeClassMetaDataLoader(String group)
{
- classMetaDataLoaders.remove(group);
+ return classMetaDataLoaders.remove(group);
}
@@ -258,9 +259,9 @@
lifecycleManager.addLifecycleDefinition(def);
}
- public void removeLifecycleDefinition(String name)
+ public AspectDefinition removeLifecycleDefinition(String name)
{
- lifecycleManager.removeLifecycleDefinition(name);
+ return lifecycleManager.removeLifecycleDefinition(name);
}
public void addLifecycleBinding(LifecycleCallbackBinding lifecycleBinding)
@@ -273,9 +274,9 @@
return lifecycleManager.getLifecycleBindings();
}
- public void removeLifecycleBinding(String name)
+ public LifecycleCallbackBinding removeLifecycleBinding(String name)
{
- lifecycleManager.removeLifecycleBinding(name);
+ return lifecycleManager.removeLifecycleBinding(name);
}
public ArrayReplacement getArrayReplacement(String name)
@@ -296,11 +297,11 @@
}
}
- public void removeArrayReplacement(String name)
+ public ArrayReplacement removeArrayReplacement(String name)
{
synchronized (arrayReplacements)
{
- arrayReplacements.remove(name);
+ return arrayReplacements.remove(name);
}
}
@@ -323,13 +324,14 @@
}
}
- public void removeArrayBinding(String name)
+ public ArrayBinding removeArrayBinding(String name)
{
synchronized (arrayBindings)
{
ArrayBinding pointcut = arrayBindings.remove(name);
- if (pointcut == null) return;
+ if (pointcut == null) return null;
ArrayAdvisor.removeBinding(pointcut);
+ return pointcut;
}
}
@@ -349,12 +351,12 @@
}
}
- public void removeAnnotationIntroduction(AnnotationIntroduction introduction)
+ public AnnotationIntroduction removeAnnotationIntroduction(AnnotationIntroduction introduction)
{
String name = introduction.getOriginalAnnotationExpr() + introduction.getOriginalExpression();
synchronized (annotationIntroductions)
{
- annotationIntroductions.remove(name);
+ return annotationIntroductions.remove(name);
}
}
@@ -377,9 +379,9 @@
return adviceStacks.get(name);
}
- public void removeAdviceStack(String name)
+ public AdviceStack removeAdviceStack(String name)
{
- adviceStacks.remove(name);
+ return adviceStacks.remove(name);
}
public Map<String, AdviceStack> getAdviceStacks()
Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java 2009-02-23 16:18:37 UTC (rev 84641)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java 2009-02-23 16:18:39 UTC (rev 84642)
@@ -60,9 +60,10 @@
/**
* Removes a cflow stack
- * @param name The name of the cflow stack
+ * @param name The name of the cflow stack
+ * @return The removed cflow stack, or null if not removed
*/
- void removeCFlowStack(String name);
+ CFlowStack removeCFlowStack(String name);
/**
* Get all the cflow stacks in this manager and parents
@@ -88,8 +89,9 @@
/**
* Removes a dynamic cflow definition
* @param name The name of the dynamic cflow definition
+ * @return The removed dynamic cflow, or null if not removed
*/
- void removeDynamicCFlow(String name);
+ DynamicCFlowDefinition removeDynamicCFlow(String name);
/**
* Get all the dynamic cflows in this manager and parents
@@ -106,8 +108,9 @@
/**
* Removes a typedef
* @param name The name of the typedef
+ * @return The removed typedef, or null if not removed
*/
- void removeTypedef(String name);
+ Typedef removeTypedef(String name);
/**
* Gets a typedef
@@ -140,8 +143,9 @@
/**
* Removes an interceptor factory
* @param name The name of the interceptor factory
+ * @return The removed interceptor factory, or null if not removed
*/
- void removeInterceptorFactory(String name);
+ InterceptorFactory removeInterceptorFactory(String name);
/**
* Get all the interceptor factories in this manager and parents
@@ -165,8 +169,9 @@
/**
* Removes an introduction
* @param name The name of the introduction
+ * @return The removed interface introduction, or null if not removed
*/
- void removeInterfaceIntroduction(String name);
+ InterfaceIntroduction removeInterfaceIntroduction(String name);
/**
* Get all the introduction in this manager and parents
@@ -193,9 +198,9 @@
/**
* Remove a metadata loader for a given group
* @param group The name of the metadata group
- *
+ * @return The removed class metadata loader, or null if not removed
*/
- void removeClassMetaDataLoader(String group);
+ ClassMetaDataLoader removeClassMetaDataLoader(String group);
/**
* Get the metadata loaders in this manager and parents
@@ -212,8 +217,9 @@
/**
* Remove a lifecycle callback definition
* @param name The name of the lifecycle aspect defintion to remove
+ * @return The removed lifecycle definition, or null if not removed
*/
- void removeLifecycleDefinition(String name);
+ AspectDefinition removeLifecycleDefinition(String name);
/**
* Add a lifecycle callback binding
@@ -223,9 +229,10 @@
/**
* Remove a lifecycle callback bindings
- * @return The name of the lifecycle callback binding to remove
+ * @param name The name of the lifecycle callback binding to remove
+ * @return The removed lifecycle callback binding, or null if not removed
*/
- void removeLifecycleBinding(String name);
+ LifecycleCallbackBinding removeLifecycleBinding(String name);
/**
* Get the lifecycle callback bindings in this manager
@@ -251,8 +258,9 @@
/**
* Remove an array replacement
* @param name Name of the array replacement to remove
+ * @return The removed array replacement, or null if not removed
*/
- void removeArrayReplacement(String name);
+ ArrayReplacement removeArrayReplacement(String name);
/**
* Register an array binding
@@ -270,8 +278,9 @@
/**
* Remove an array binding
* @param name Name of the array binding to remove
+ * @return The removed array binding, or null if not removed
*/
- void removeArrayBinding(String name);
+ ArrayBinding removeArrayBinding(String name);
/**
* Gets all the array replacements in this manager and its parent
@@ -288,8 +297,9 @@
/**
* Removes an annotation introduction
* @param introduction The introduction to remove
+ * @return The removed annotation introduction, or null if not removed
*/
- void removeAnnotationIntroduction(AnnotationIntroduction introduction);
+ AnnotationIntroduction removeAnnotationIntroduction(AnnotationIntroduction introduction);
/**
* Get all the annotation introductions in this manager and its parent
@@ -313,8 +323,9 @@
/**
* Remove an advice stack
* @param name Name of the advice stack to remove
+ * @return The removed advice stack, or null if not removed
*/
- void removeAdviceStack(String name);
+ AdviceStack removeAdviceStack(String name);
/**
* Gets all the advice stacks registered in this manager and its parents
@@ -338,6 +349,7 @@
/**
* Removes an aspect definition
* @param removes an aspect definition
+ * @return The removed aspect definition, or null if not returned
*/
AspectDefinition removeAspectDefinition(String name);
@@ -368,261 +380,4 @@
*/
Map<String, Object> getPerVMAspects();
-
-// InterceptionMarkers getInterceptionMarkers(ClassLoader loader);
-//
-// Map<String, Pointcut> getPointcuts();
-//
-// Map<String, PointcutInfo> getPointcutInfos();
-//
-// DynamicCFlow getDynamicCFlow(String name, ClassLoader cl);
-//
-// void addDynamicCFlow(String name, DynamicCFlowDefinition cflow);
-//
-// void removeDynamicCFlow(String name);
-//
-// ClassMetaDataLoader findClassMetaDataLoader(String group);
-//
-// void addClassMetaDataLoader(String group, ClassMetaDataLoader loader);
-//
-// void removeClassMetaDataLoader(String group);
-//
-// Map<Class<?>, WeakReference<Advisor>> getAdvisors();
-//
-// Advisor getAdvisor(String name);
-//
-// Map<String, AdviceBinding> getBindings();
-//
-// ClassifiedBindingAndPointcutCollection getBindingCollection();
-//
-// Map<Class<?>, WeakReference<Domain>> getSubDomainsPerClass();
-//
-// Advisor findAdvisor(Class<?> clazz);
-//
-// AspectManager findManagerByName(String fqn);
-//
-// AspectManager findManagerByName(String[] nameparts);
-//
-// String getManagerFQN();
-//
-// ClassAdvisor getAdvisorIfAdvised(Class<?> clazz);
-//
-// Advisor getAnyAdvisorIfAdvised(Class<?> clazz);
-//
-// ClassAdvisor getAdvisor(Class<?> clazz);
-//
-// void initialiseClassAdvisor(Class<?> clazz, ClassAdvisor advisor);
-//
-// boolean isAdvisorRegistered(Advisor advisor);
-//
-// ClassPool findClassPool(ClassLoader cl);
-//
-// ClassPool findClassPool(Class<?> clazz);
-//
-// ClassPool getRegisteredClassPool(ClassLoader cl);
-//
-// ClassPool registerClassLoader(ClassLoader ucl);
-//
-// void unregisterClassLoader(ClassLoader cl);
-//
-// ArrayList<String> getExclude();
-//
-// void setExclude(ArrayList<String> exclude);
-//
-// ArrayList<String> getInclude();
-//
-// void setInclude(ArrayList<String> include);
-//
-// ArrayList<String> getIgnore();
-//
-// List<String> getIncludedInvisibleAnnotations();
-//
-// void setIncludedInvisibleAnnotations(List<String> ia);
-//
-// ClassExpression[] getIgnoreExpressions();
-//
-// void setIgnore(ArrayList<String> ignore);
-//
-// boolean ignoreClass(String classname);
-//
-// boolean includeClass(String classname);
-//
-// boolean excludeClass(String classname);
-//
-// boolean isNonAdvisableClassName(String classname);
-//
-// byte[] transform(ClassLoader loader,
-// String className,
-// @SuppressWarnings(value= {"all"}) Class classBeingRedefined,
-// ProtectionDomain protectionDomain,
-// byte[] classfileBuffer)
-// throws Exception;
-//
-// byte[] translate(String className, ClassLoader loader) throws Exception;
-//
-// byte[] translate(String className, ClassLoader loader, byte[] classfileBuffer) throws Exception;
-//
-// void addInterceptorFactory(String name, InterceptorFactory factory);
-//
-// void removeInterceptorFactory(String name);
-//
-// Map<String, InterceptorFactory> getInterceptorFactories();
-//
-// InterceptorFactory getInterceptorFactory(String name);
-//
-// void addPrecedence(PrecedenceDef precedenceDef);
-//
-// void removePrecedence(String name);
-//
-// Map<String, PrecedenceDef> getPrecedenceDefs();
-//
-// PrecedenceDefEntry[] getSortedPrecedenceDefEntries();
-//
-// void addAdviceStack(AdviceStack stack);
-//
-// void removeInterceptorStack(String name);
-//
-// AdviceStack getAdviceStack(String name);
-//
-// ClassAdvisor getTempClassAdvisor(CtClass clazz) throws Exception;
-//
-// Advisor getTempClassAdvisorIfNotExist(Class<?> clazz);
-//
-// DomainDefinition getContainer(String name);
-//
-// void addContainer(DomainDefinition def);
-//
-// void removeContainer(String name);
-//
-// Pointcut getPointcut(String name);
-//
-// void removePointcut(String name);
-//
-// void addPointcut(Pointcut pointcut);
-//
-// boolean isExecution();
-//
-// boolean isConstruction();
-//
-// boolean isCall();
-//
-// boolean isWithin();
-//
-// boolean isWithincode();
-//
-// boolean isGet();
-//
-// boolean isSet();
-//
-// void removeBinding(String name);
-//
-// void removeBindings(ArrayList<String> binds);
-//
-// void addBinding(AdviceBinding binding);
-//
-// void updateAdvisorsForAddedBinding(AdviceBinding binding, Set<Advisor> handledAdvisors);
-//
-// void removeClassMetaData(String name);
-//
-// void internalRemoveClassMetaData(String name);
-//
-// void addClassMetaData(ClassMetaDataBinding meta);
-//
-// InterfaceIntroduction getInterfaceIntroduction(String name);
-//
-// void addInterfaceIntroduction(InterfaceIntroduction pointcut);
-//
-// void removeInterfaceIntroduction(String name);
-//
-// ArrayReplacement getArrayReplacement(String name);
-//
-// void addArrayReplacement(ArrayReplacement pointcut);
-//
-// void removeArrayReplacement(String name);
-//
-// ArrayBinding getArrayBinding(String name);
-//
-// void addArrayBinding(ArrayBinding binding);
-//
-// void removeArrayBinding(String name);
-//
-// void addAnnotationIntroduction(AnnotationIntroduction pointcut);
-//
-// void removeAnnotationIntroduction(AnnotationIntroduction pointcut);
-//
-// List<AnnotationIntroduction> getAnnotationIntroductions();
-//
-// void addDeclare(DeclareDef declare);
-//
-// void removeDeclare(String name);
-//
-// Iterator<DeclareDef> getDeclares();
-//
-// void addAnnotationOverride(AnnotationIntroduction pointcut);
-//
-// void updateAdvisorsForAddedAnnotationOverride(AnnotationIntroduction introduction);
-//
-// void removeAnnotationOverride(AnnotationIntroduction pointcut);
-//
-// List<AnnotationIntroduction> getAnnotationOverrides();
-//
-// Object getPerVMAspect(AspectDefinition def);
-//
-// Object getPerVMAspect(String def);
-//
-// Object createPerVmAspect(String def, AspectDefinition adef, ClassLoader scopedClassLoader);
-//
-// void addAspectDefinition(AspectDefinition def);
-//
-// void removeAspectDefinition(String name);
-//
-// Map<String, AspectDefinition> getAspectDefinitions();
-//
-// AspectDefinition getAspectDefinition(String name);
-//
-// void addTypedef(Typedef def) throws Exception;
-//
-// void removeTypedef(String name);
-//
-// Typedef getTypedef(String name);
-//
-// Map<String, InterfaceIntroduction> getInterfaceIntroductions();
-//
-// Map<String, ArrayReplacement> getArrayReplacements();
-//
-// Map<String, Typedef> getTypedefs();
-//
-// Map<String, AdviceStack> getInterceptorStacks();
-//
-// Map<String, ClassMetaDataLoader> getClassMetaDataLoaders();
-//
-// Map<String, CFlowStack> getCflowStacks();
-//
-// Map<String, DynamicCFlowDefinition> getDynamicCFlows();
-//
-// Map<String, Object> getPerVMAspects();
-//
-// Map<String, ClassMetaDataBinding> getClassMetaData();
-//
-// DynamicAOPStrategy getDynamicAOPStrategy();
-//
-// void setDynamicAOPStrategy(DynamicAOPStrategy strategy);
-//
-// void addSubDomainPerClass(Class<?> clazz, Domain domain);
-//
-// void subscribeSubDomain(Domain domain);
-//
-// void unsubscribeSubDomain(Domain domain);
-//
-// Map<Domain, Object> getSubscribedSubDomains();
-//
-// void addLifecycleDefinition(AspectDefinition def);
-//
-// void removeLifecycleDefinition(String name);
-//
-// void addLifecycleBinding(LifecycleCallbackBinding lifecycleBinding);
-//
-// Map<String, LifecycleCallbackBinding> getLifecycleBindings();
-//
-// void removeLifecycleBinding(String name);
}
More information about the jboss-cvs-commits
mailing list