dev@javaserverfaces.java.net

[REVIEW] Remove unneeded classes

From: Ryan Lubke <Ryan.Lubke_at_Sun.COM>
Date: Tue, 09 Nov 2004 11:01:21 -0500

Minor cleanup...

SECTION: Modified Files
------------------------------------------
Modified Files
------------------
M build-tests.xml
  - removed reference to TestInstancePool_local

M build.xml
  - uncommened task to deleted merged.xml

M src/com/sun/faces/application/ApplicationAssociate.java
 - removed references to InstancePool
 
Files Removed
------------------
R src/com/sun/faces/util/InstancePool.java
R src/com/sun/faces/util/JSFBitSet.java
R test/com/sun/faces/util/TestInstancePool_local.java
   - these are no longer needed with new EL implementation
     in place



SECTION: Diffs
------------------------------------------
Index: build-tests.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build-tests.xml,v
retrieving revision 1.206
diff -u -r1.206 build-tests.xml
--- build-tests.xml 12 Oct 2004 14:39:48 -0000 1.206
+++ build-tests.xml 9 Nov 2004 16:00:42 -0000
@@ -389,8 +389,7 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml" usefile="true"/>
             <jvmarg
line="-Djcov.file=${out.test.dir}/jsf-impl-junit.jcov"/>
- <test todir="${test.results.dir}"
name="com.sun.faces.util.TestUtil_local"/>
- <test todir="${test.results.dir}"
name="com.sun.faces.util.TestInstancePool_local"/>
+ <test todir="${test.results.dir}"
name="com.sun.faces.util.TestUtil_local"/>
         </junit>
 
     </target>
Index: build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
retrieving revision 1.170
diff -u -r1.170 build.xml
--- build.xml 8 Nov 2004 19:23:07 -0000 1.170
+++ build.xml 9 Nov 2004 16:00:42 -0000
@@ -673,7 +673,7 @@
     version="1.2">]]>
           </replacevalue>
       </replace>
- <!--<delete file="${basedir}/merged.xml"/> -->
+ <delete file="${basedir}/merged.xml"/>
   </target>
 
   <!--
Index: src/com/sun/faces/application/ApplicationAssociate.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/application/ApplicationAssociate.java,v
retrieving revision 1.4
diff -u -r1.4 ApplicationAssociate.java
--- src/com/sun/faces/application/ApplicationAssociate.java 12 Oct
2004 14:39:48 -0000 1.4
+++ src/com/sun/faces/application/ApplicationAssociate.java 9 Nov
2004 16:00:42 -0000
@@ -9,27 +9,24 @@
 
 package com.sun.faces.application;
 
-import com.sun.faces.util.Util;
-import com.sun.faces.util.InstancePool;
 import com.sun.faces.RIConstants;
 import com.sun.faces.config.ConfigureListener;
+import com.sun.faces.config.ManagedBeanFactory;
+import com.sun.faces.util.Util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
 
-import java.util.Map;
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.TreeSet;
-import java.util.Comparator;
-import java.util.Collections;
-
-import javax.faces.context.FacesContext;
-import javax.faces.context.ExternalContext;
-import javax.faces.FacesException;
-
-import com.sun.faces.config.ManagedBeanFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * <p>Break out the things that are associated with the Application, but
@@ -87,12 +84,6 @@
     "ApplicationAssociate";
 
 
- /**
- * <p>Used by the EL system to pool instances of ExpressionInfo.
- * </p>
- */
- private InstancePool expressionInfoInstancePool;
-
     public ApplicationAssociate(ApplicationImpl appImpl) {
     app = appImpl;
     ExternalContext externalContext = null;
@@ -109,8 +100,7 @@
         managedBeanFactoriesMap = new HashMap();
         caseListMap = new HashMap();
         wildcardMatchList = new TreeSet(new SortIt());
-
- expressionInfoInstancePool = new InstancePool();
+
     }
    
     public static ApplicationAssociate getInstance(ExternalContext
@@ -315,19 +305,6 @@
 
         String viewId;
         ConfigNavigationCase navCase;
- }
-
- /**
- * <p>@return the {_at_link InstancePool} that is allocated for the
- * purposes of holding {_at_link com.sun.faces.el.impl.ExpressionInfo}
- * instances. The ApplicationAssociate does nothing but serve as
- * the owning reference of the <code>InstancePool</code>. Actual
- * usage of the <code>InstancePool</code> happens in the EL
- * package.</p>
- */
-
- public InstancePool getExpressionInfoInstancePool() {
- return expressionInfoInstancePool;
     }
 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net