cziegeler 2003/10/24 01:49:49
Modified: src/blocks/scratchpad/java/org/apache/cocoon/transformation CastorTransformer.java src/blocks/scratchpad/java/org/apache/cocoon/ant CocoonTask.java src/blocks/scratchpad/java/org/apache/cocoon/selection DateSelector.java Log: Cleaning up code Revision Changes Path 1.6 +1 -5 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/CastorTransformer.java Index: CastorTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/CastorTransformer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CastorTransformer.java 11 Oct 2003 01:27:09 -0000 1.5 +++ CastorTransformer.java 24 Oct 2003 08:49:49 -0000 1.6 @@ -139,8 +139,6 @@ /** The map of namespace prefixes. */ private Map prefixMap = new HashMap(); - private boolean in_castor_marshal = false; - private Unmarshaller unmarshaller; private UnmarshalHandler unmarshalHandler; private ContentHandler unmarshalContentHandler; @@ -199,7 +197,6 @@ unmarshalContentHandler.endElement(uri, name, raw); } } else if (CASTOR_URI.equals(uri)) { - in_castor_marshal = false; } else { super.endElement(uri, name, raw); } @@ -222,7 +219,6 @@ private void process (String command, Attributes attr) throws SAXException { if (command.equals(CMD_MARSHAL)) { - in_castor_marshal = true; String scope = attr.getValue(ATTRIB_SCOPE); String name = attr.getValue(ATTRIB_NAME); 1.5 +4 -4 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java Index: CocoonTask.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CocoonTask.java 24 Sep 2003 22:00:34 -0000 1.4 +++ CocoonTask.java 24 Oct 2003 08:49:49 -0000 1.5 @@ -140,7 +140,7 @@ private String acceptHeader; private String agentHeader; - private Boolean preCompileOnly; + //private Boolean preCompileOnly; private Boolean followLinks; /** @@ -166,7 +166,7 @@ this.logger = "cocoon"; this.acceptHeader = DEFAULT_ACCEPT; this.agentHeader = DEFAULT_USER_AGENT; - this.preCompileOnly = new Boolean(false); + //this.preCompileOnly = new Boolean(false); this.followLinks = new Boolean(true); this.targets = new ArrayList(); } @@ -228,7 +228,7 @@ * @param preCompileOnly The new precompileOnly value */ public void setPrecompileOnly(boolean preCompileOnly) { - this.preCompileOnly = new Boolean(preCompileOnly); + //this.preCompileOnly = new Boolean(preCompileOnly); } 1.3 +10 -7 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java Index: DateSelector.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DateSelector.java 5 Sep 2003 07:04:35 -0000 1.2 +++ DateSelector.java 24 Oct 2003 08:49:49 -0000 1.3 @@ -62,6 +62,7 @@ import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; @@ -264,7 +265,7 @@ configure( config, AFTER_ELEMENT, map ); // 2 create SelectorContext - DateSelectorContext csc = new DateSelectorContext(); + DateSelectorContext csc = new DateSelectorContext(this.getLogger()); // 3 precalculate result of comparing current date, and configuration map csc.setup( map ); @@ -368,10 +369,12 @@ private class DateSelectorContext { Date now; HashSet set; + Logger logger; - public DateSelectorContext() { + public DateSelectorContext(Logger logger) { now = new Date(); set = new HashSet(); + this.logger = logger; } public void setup( final Map map ) { @@ -381,15 +384,15 @@ final String name = (String)entry.getKey(); final DateComparator dc = (DateComparator)entry.getValue(); - if (getLogger().isDebugEnabled()) { - getLogger().debug( + if (this.logger.isDebugEnabled()) { + this.logger.debug( "Compare name " + name + " having date " + String.valueOf( dc.getDate() ) + " to " + String.valueOf( now ) ); } // only store name in set iff comparison is true if (dc.compareTo( now )) { - if (getLogger().isDebugEnabled()) { - getLogger().debug( + if (this.logger.isDebugEnabled()) { + this.logger.debug( "Storing name " + String.valueOf( name ) + " as it yielded true " ); } this.set.add( name );