joerg       2003/10/10 18:32:53

  Modified:    src/java/org/apache/cocoon/bean CocoonBean.java
               src/java/org/apache/cocoon/generation
                        JXTemplateGenerator.java
               src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples
                        BindingWoodyApple.java
  Log:
  clean up
  
  Revision  Changes    Path
  1.35      +1 -2      cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
  
  Index: CocoonBean.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- CocoonBean.java	7 Oct 2003 09:59:17 -0000	1.34
  +++ CocoonBean.java	11 Oct 2003 01:32:53 -0000	1.35
  @@ -102,7 +102,6 @@
       private boolean followLinks = true;
       private boolean precompileOnly = false;
       private boolean confirmExtension = true;
  -    private boolean checksumCompare = false;
       private String defaultFilename = Constants.INDEX_URI;
       private boolean brokenLinkGenerate = false;
       private String brokenLinkExtension = "";
  
  
  
  1.11      +0 -12     cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
  
  Index: JXTemplateGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JXTemplateGenerator.java	25 Sep 2003 16:57:44 -0000	1.10
  +++ JXTemplateGenerator.java	11 Oct 2003 01:32:53 -0000	1.11
  @@ -860,18 +860,6 @@
           return res;
       }
   
  -    // Compile an numeric expression (returns either a Compiled Expression
  -    // or an Number literal)
  -    private static Expression compileNumber(String val, String msg, Locator location) 
  -        throws SAXException {
  -        Expression res = compileExpr(val, msg, location);
  -        if (res == null) return null;
  -        if (res.compiledExpression == null) {
  -            res.compiledExpression = Integer.valueOf(res.raw);
  -        }
  -        return res;
  -    }
  -
       private static Expression compileBoolean(String val, String msg, Locator location) 
           throws SAXException {
           Expression res = compileExpr(val, msg, location);
  
  
  
  1.6       +0 -7      cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
  
  Index: BindingWoodyApple.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BindingWoodyApple.java	25 Sep 2003 21:18:49 -0000	1.5
  +++ BindingWoodyApple.java	11 Oct 2003 01:32:53 -0000	1.6
  @@ -215,13 +215,6 @@
           }
       }
   
  -    private Object makeInstance(String fqcn)
  -        throws ClassNotFoundException, InstantiationException, IllegalAccessException {
  -
  -        Class clazz = Class.forName(fqcn);
  -        return clazz.newInstance();
  -    }
  -
       private void completeResult(AppleResponse res, String uri, boolean finished) {
           res.sendPage(uri, getContextMap());
           // TODO think about transferring the fact that the use case has ended.