[WebMacro-cvs] webmacro/src/org/webmacro/directive AlternateDirective.java,1.10,1.11 CountDirective.java,1.3,1.4 IncludeDirective.java,1.14,1.15 TypeDirective.java,1.6,1.7

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv15906/src/org/webmacro/directive

Modified Files:
	AlternateDirective.java CountDirective.java 
	IncludeDirective.java TypeDirective.java 
Log Message:
- adding copyright headers where they were missing
- fix a few import statements
- minor javadoc cleanup here and there
- used IDEA to find and fix redundant type casts and unused assignments.


Index: AlternateDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/AlternateDirective.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AlternateDirective.java	11 Nov 2002 04:26:12 -0000	1.10
--- AlternateDirective.java	11 Nov 2002 19:22:36 -0000	1.11
***************
*** 109,113 ****
           Iterator itr = context.getBroker()._propertyOperators.getIterator(l);
  
!          target.setValue(context, (Object) new IteratorAlternator(itr));
        }
        catch (Exception e) {
--- 109,113 ----
           Iterator itr = context.getBroker()._propertyOperators.getIterator(l);
  
!          target.setValue(context, new IteratorAlternator(itr));
        }
        catch (Exception e) {

Index: CountDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/CountDirective.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CountDirective.java	11 Nov 2002 04:26:12 -0000	1.3
--- CountDirective.java	11 Nov 2002 19:22:36 -0000	1.4
***************
*** 1,9 ****
  /*
!  * Created by IntelliJ IDEA.
!  * User: e_ridge
!  * Date: Oct 18, 2002
!  * Time: 4:44:50 PM
!  * To change template for new class use
!  * Code Style | Class Templates options (Tools | IDE Options).
   */
  package org.webmacro.directive;
--- 1,22 ----
  /*
!  * Copyright (C) 1998-2000 Semiotek Inc.  All Rights Reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted under the terms of either of the following
!  * Open Source licenses:
!  *
!  * The GNU General Public License, version 2, or any later version, as
!  * published by the Free Software Foundation
!  * (http://www.fsf.org/copyleft/gpl.html);
!  *
!  *  or
!  *
!  * The Semiotek Public License (http://webmacro.org/LICENSE.)
!  *
!  * This software is provided "as is", with NO WARRANTY, not even the
!  * implied warranties of fitness to purpose, or merchantability. You
!  * assume all risks and liabilities associated with its use.
!  *
!  * See www.webmacro.org for more information on the WebMacro project.
   */
  package org.webmacro.directive;
***************
*** 17,20 ****
--- 30,36 ----
  /**
   * #count $i from 1 to 100 [step 1]
+  *
+  * @author Eric B. Ridge (eb...@tc...)
+  * @since 1.1b1
   */
  public class CountDirective extends org.webmacro.directive.Directive {

Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** IncludeDirective.java	5 Nov 2002 22:01:28 -0000	1.14
--- IncludeDirective.java	11 Nov 2002 19:22:36 -0000	1.15
***************
*** 472,483 ****
        catch (ResourceException re) {
           try {
-             java.net.URL url = b.getResource(name);
              try {
-                // this does not work for me, because
-                // getContent() returns an instance of
-                // a BufferedInputStream() on my platform.
                 // The UrlProvider knows, how to do this,
                 // so let him do the work for us
-                //return url.getContent ().toString();
                 return b.get("url", name).toString();
              }
--- 472,478 ----

Index: TypeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/TypeDirective.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TypeDirective.java	12 Jun 2002 17:35:34 -0000	1.6
--- TypeDirective.java	11 Nov 2002 19:22:36 -0000	1.7
***************
*** 1,8 ****
  /*
!  * TypeDirective.java
   *
!  * Created on June 13, 2001, 12:22 AM
   */
- 
  package org.webmacro.directive;
  
--- 1,23 ----
  /*
!  * Copyright (C) 1998-2000 Semiotek Inc.  All Rights Reserved.
   *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted under the terms of either of the following
!  * Open Source licenses:
!  *
!  * The GNU General Public License, version 2, or any later version, as
!  * published by the Free Software Foundation
!  * (http://www.fsf.org/copyleft/gpl.html);
!  *
!  *  or
!  *
!  * The Semiotek Public License (http://webmacro.org/LICENSE.)
!  *
!  * This software is provided "as is", with NO WARRANTY, not even the
!  * implied warranties of fitness to purpose, or merchantability. You
!  * assume all risks and liabilities associated with its use.
!  *
!  * See www.webmacro.org for more information on the WebMacro project.
   */
  package org.webmacro.directive;