[jboss-cvs] JBossAS SVN: r64498 - in projects/microcontainer/trunk: container/src/main/org/jboss/annotation/factory/javassist and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-08-08 04:37:26 -0400 (Wed, 08 Aug 2007)
New Revision: 64498

Removed:
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionDelegateHolder.java
Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
   projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
Log:
Removing IntrospectionTypeInfoFactoryImpl creation.
Added FIXME to AOPDependencyBuilder.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java	2007-08-08 04:05:09 UTC (rev 64497)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java	2007-08-08 08:37:26 UTC (rev 64498)
@@ -29,8 +29,8 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
-import java.util.Map.Entry;
 
 import org.jboss.aop.Advisor;
 import org.jboss.aop.AspectManager;
@@ -73,6 +73,7 @@
 {
    private static final String DEPENDENCY_CLASS_NAME = Dependency.class.getName();
    private static final String DEPENDENCY_NAME_ATTRIBUTE = "name";
+   // FIXME - do not create new instance, use existing delegate in IntrospectionTypeInfoFactory 
    private static final IntrospectionTypeInfoFactoryImpl typeInfoFactory = new IntrospectionTypeInfoFactoryImpl();
 
    public List<DependencyBuilderListItem> getDependencies(ClassAdapter classAdapter, MetaData metaData)

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java	2007-08-08 04:05:09 UTC (rev 64497)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java	2007-08-08 08:37:26 UTC (rev 64498)
@@ -24,8 +24,6 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 
-import org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactoryImpl;
-
 import javassist.bytecode.annotation.Annotation;
 import javassist.bytecode.annotation.AnnotationMemberValue;
 import javassist.bytecode.annotation.ArrayMemberValue;
@@ -42,6 +40,8 @@
 import javassist.bytecode.annotation.MemberValueVisitor;
 import javassist.bytecode.annotation.ShortMemberValue;
 import javassist.bytecode.annotation.StringMemberValue;
+import org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactory;
+import org.jboss.reflect.spi.TypeInfoFactory;
 
 /**
  * 
@@ -52,7 +52,7 @@
 {
    Object value;
    Method method;
-   static IntrospectionTypeInfoFactoryImpl typeFactory = new IntrospectionTypeInfoFactoryImpl();
+   static TypeInfoFactory typeFactory = new IntrospectionTypeInfoFactory();
 
    public MemberValueGetter(Method method)
    {

Deleted: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionDelegateHolder.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionDelegateHolder.java	2007-08-08 04:05:09 UTC (rev 64497)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionDelegateHolder.java	2007-08-08 08:37:26 UTC (rev 64498)
@@ -1,38 +0,0 @@
-/*
-* 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.reflect.plugins.introspection;
-
-/**
- * Delegate holder.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class IntrospectionDelegateHolder
-{
-   /** The delegate */
-   private static IntrospectionTypeInfoFactoryImpl delegate = new IntrospectionTypeInfoFactoryImpl();
-
-   protected IntrospectionTypeInfoFactoryImpl getDelegate()
-   {
-      return delegate;
-   }
-}