From: Tim P <ti...@us...> - 2008-03-20 09:49:33
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16957/src/org/webmacro/engine Modified Files: PropertyOperatorCache.java Log Message: Checkstyle: organise imports Index: PropertyOperatorCache.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/PropertyOperatorCache.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** PropertyOperatorCache.java 19 Feb 2004 08:23:55 -0000 1.22 --- PropertyOperatorCache.java 20 Mar 2008 09:49:29 -0000 1.23 *************** *** 21,38 **** */ - package org.webmacro.engine; - import org.webmacro.*; - import org.webmacro.resource.CacheManager; - import org.webmacro.resource.SimpleCacheManager; - import org.webmacro.util.*; - import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; ! import java.util.*; final public class PropertyOperatorCache { --- 21,57 ---- */ package org.webmacro.engine; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; ! import java.util.ArrayList; ! import java.util.Enumeration; ! import java.util.HashMap; ! import java.util.Iterator; ! import java.util.List; ! import java.util.Map; ! import java.util.StringTokenizer; ! import java.util.Vector; + import org.webmacro.Broker; + import org.webmacro.Context; + import org.webmacro.InitException; + import org.webmacro.Log; + import org.webmacro.PropertyException; + import org.webmacro.resource.CacheManager; + import org.webmacro.resource.SimpleCacheManager; + import org.webmacro.util.ArrayIterator; + import org.webmacro.util.EnumIterator; + import org.webmacro.util.PrimitiveArrayIterator; + import org.webmacro.util.PropertyMethod; + import org.webmacro.util.Settings; + + /** + * @author Brian Goetz + * @since 28 Apr 2001 + * + */ final public class PropertyOperatorCache { *************** *** 55,59 **** if (cacheManager == null || cacheManager.equals("")) { ! _log.info("CachingProvider: No cache manager specified for PropertyOperator, using SimpleCacheManager"); _cache = new SimpleCacheManager(); } --- 74,80 ---- if (cacheManager == null || cacheManager.equals("")) { ! _log.info("CachingProvider: " + ! "No cache manager specified for PropertyOperator, " + ! "using SimpleCacheManager"); _cache = new SimpleCacheManager(); } *************** *** 83,87 **** { Class c = Class.forName(className); ! String okMethList = b.getSetting("RestrictedClasses.AllowedMethods." + className); ArrayList okMeths = null; if (okMethList != null) --- 104,109 ---- { Class c = Class.forName(className); ! String okMethList = b.getSetting( ! "RestrictedClasses.AllowedMethods." + className); ArrayList okMeths = null; if (okMethList != null) *************** *** 142,145 **** --- 164,168 ---- * introspection described above. Begin reading names at position * start in the array of names. + * * @param context is used to resolve sub-properties in arguments * @param instance is the root of introspection *************** *** 167,171 **** /** ! * Calls getProperty(context, instance, names, 0) */ final public Object getProperty(final Context context, --- 190,194 ---- /** ! * Calls getProperty(context, instance, names, 0). */ final public Object getProperty(final Context context, *************** *** 181,184 **** --- 204,208 ---- * Given a property description name, attempt to set the property * value to the supplied object. + * * @param context An object containing a property * @param names The string names of that property *************** *** 228,231 **** --- 252,256 ---- * Evaluate the supplied object and work out a way to return it * as an iterator. + * * @param instance an object believed to represent a list * @return an Iterator that iterates through that list *************** *** 820,824 **** } ! if ( start <= end) { try --- 845,849 ---- } ! if (start <= end) { try |