You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/07/15 17:33:07 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper TemplateBaseLayoutMapper.java TemplateBaseMapper.java TemplateClassMapper.java TemplateDirectMapper.java TemplateLayoutMapper.java TemplateScreenDefaultMapper.java TemplateScreenMapper.java

henning     2003/07/15 08:33:07

  Modified:    src/java/org/apache/turbine/services/template/mapper
                        TemplateBaseLayoutMapper.java
                        TemplateBaseMapper.java TemplateClassMapper.java
                        TemplateDirectMapper.java TemplateLayoutMapper.java
                        TemplateScreenDefaultMapper.java
                        TemplateScreenMapper.java
  Log:
  Remove the no longer needed parameter taking  C'tors. Objects now come
  from a factory and are bean-setted.
  
  Revision  Changes    Path
  1.5       +1 -15     jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseLayoutMapper.java
  
  Index: TemplateBaseLayoutMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseLayoutMapper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TemplateBaseLayoutMapper.java	15 Jul 2003 15:30:16 -0000	1.4
  +++ TemplateBaseLayoutMapper.java	15 Jul 2003 15:33:06 -0000	1.5
  @@ -85,20 +85,6 @@
       }
   
       /**
  -     * C'tor
  -     *
  -     * @param useCache If true, then the resulting mapper will cache mappings.
  -     * @param cacheSize Size of the internal map cache. Must be > 0 if useCache is true.
  -     * @param defaultProperty The name of the default property to pull from the TemplateEngine
  -     * @param separator The separator for this mapper.
  -     */
  -    public TemplateBaseLayoutMapper(boolean useCache, int cacheSize, String defaultProperty, char separator, String prefix)
  -    {
  -        super(useCache, cacheSize, defaultProperty, separator);
  -        setPrefix(prefix);
  -    }
  -
  -    /**
        * Get the Prefix value.
        * @return the Prefix value.
        */
  
  
  
  1.5       +1 -17     jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseMapper.java
  
  Index: TemplateBaseMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateBaseMapper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TemplateBaseMapper.java	15 Jul 2003 15:30:16 -0000	1.4
  +++ TemplateBaseMapper.java	15 Jul 2003 15:33:06 -0000	1.5
  @@ -101,22 +101,6 @@
       }
   
       /**
  -     * C'tor
  -     *
  -     * @param useCache If true, then the resulting mapper will cache mappings.
  -     * @param cacheSize Size of the internal map cache. Must be > 0 if useCache is true.
  -     * @param defaultProperty The name of the default property to pull from the TemplateEngine
  -     * @param separator The separator for this mapper.
  -     */
  -    public TemplateBaseMapper(boolean useCache, int cacheSize, String defaultProperty, char separator)
  -    {
  -        setCacheSize(cacheSize);
  -        setUseCache(useCache);
  -        setDefaultProperty(defaultProperty);
  -        setSeparator(separator);
  -    }
  -
  -    /**
        * Get the CacheSize value.
        * @return the CacheSize value.
        */
  
  
  
  1.6       +1 -20     jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateClassMapper.java
  
  Index: TemplateClassMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateClassMapper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TemplateClassMapper.java	15 Jul 2003 15:30:16 -0000	1.5
  +++ TemplateClassMapper.java	15 Jul 2003 15:33:06 -0000	1.6
  @@ -106,25 +106,6 @@
       }
   
       /**
  -     * C'tor.
  -     *
  -     * @param useCache If true, then the resulting mapper will cache mappings.
  -     * @param cacheSize Size of the internal map cache. Must be > 0 if useCache is true.
  -     * @param defaultProperty The name of the default property to pull from the TemplateEngine
  -     * @param separator The separator for this mapper.
  -     * @param loader A loader object which is used to instantiate the requested classes.
  -     */
  -    public TemplateClassMapper(boolean useCache,
  -        int cacheSize,
  -        String defaultProperty,
  -        char separator,
  -        Loader loader)
  -    {
  -        super(useCache, cacheSize, defaultProperty, separator);
  -        setLoader(loader);
  -    }
  -
  -    /**
        * Get the Loader value.
        * @return the Loader value.
        */
  
  
  
  1.5       +1 -13     jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateDirectMapper.java
  
  Index: TemplateDirectMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateDirectMapper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TemplateDirectMapper.java	15 Jul 2003 15:30:16 -0000	1.4
  +++ TemplateDirectMapper.java	15 Jul 2003 15:33:06 -0000	1.5
  @@ -79,18 +79,6 @@
       }
   
       /**
  -     * C'tor
  -     *
  -     * @param defaultProperty The name of the default property to pull from the TemplateEngine
  -     * @param separator The separator for this Mapper.
  -     */
  -    public TemplateDirectMapper(String defaultProperty, char separator)
  -    {
  -        // Never cache, cacheSize isn't used.
  -        super(false, 0, defaultProperty, separator);
  -    }
  -
  -    /**
        * Strip off a possible extension, replace all "," with "."
        *
        * about,directions,Driving.vm --> about.directions.Driving
  
  
  
  1.5       +1 -19     jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateLayoutMapper.java
  
  Index: TemplateLayoutMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateLayoutMapper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TemplateLayoutMapper.java	15 Jul 2003 15:30:16 -0000	1.4
  +++ TemplateLayoutMapper.java	15 Jul 2003 15:33:06 -0000	1.5
  @@ -99,24 +99,6 @@
       }
   
       /**
  -     * C'tor
  -     *
  -     * @param useCache If true, then the resulting mapper will cache mappings.
  -     * @param cacheSize Size of the internal map cache. Must be > 0 if useCache is true.
  -     * @param defaultProperty The name of the default property to pull from the TemplateEngine
  -     * @param separator The separator for this mapper.
  -     * @param prefix A prefix used to provide various hierarchies for screens, layouts, navigation...
  -     */
  -    public TemplateLayoutMapper(boolean useCache,
  -        int cacheSize,
  -        String defaultProperty,
  -        char separator,
  -        String prefix)
  -    {
  -        super(useCache, cacheSize, defaultProperty, separator, prefix);
  -    }
  -
  -    /**
        * Look for a given Template, then try the
        * defaults until we hit the root.
        *
  
  
  
  1.3       +1 -19     jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenDefaultMapper.java
  
  Index: TemplateScreenDefaultMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenDefaultMapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TemplateScreenDefaultMapper.java	15 Jul 2003 15:30:16 -0000	1.2
  +++ TemplateScreenDefaultMapper.java	15 Jul 2003 15:33:06 -0000	1.3
  @@ -95,24 +95,6 @@
       }
   
       /**
  -     * C'tor
  -     *
  -     * @param useCache If true, then the resulting mapper will cache mappings.
  -     * @param cacheSize Size of the internal map cache. Must be > 0 if useCache is true.
  -     * @param defaultProperty The name of the default property to pull from the TemplateEngine
  -     * @param separator The separator for this mapper.
  -     * @param prefix A prefix used to provide various hierarchies for screens, layouts, navigation...
  -     */
  -    public TemplateScreenDefaultMapper(boolean useCache,
  -        int cacheSize,
  -        String defaultProperty,
  -        char separator,
  -        String prefix)
  -    {
  -        super(useCache, cacheSize, defaultProperty, separator, prefix);
  -    }
  -
  -    /**
        * Look for a given Template, then try the
        * default.
        *
  
  
  
  1.5       +1 -19     jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenMapper.java
  
  Index: TemplateScreenMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/mapper/TemplateScreenMapper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TemplateScreenMapper.java	15 Jul 2003 15:30:16 -0000	1.4
  +++ TemplateScreenMapper.java	15 Jul 2003 15:33:07 -0000	1.5
  @@ -83,24 +83,6 @@
       }
   
       /**
  -     * C'tor
  -     *
  -     * @param useCache If true, then the resulting mapper will cache mappings.
  -     * @param cacheSize Size of the internal map cache. Must be > 0 if useCache is true.
  -     * @param defaultProperty The name of the default property to pull from the TemplateEngine
  -     * @param separator The separator for this mapper.
  -     * @param prefix A prefix used to provide various hierarchies for screens, layouts, navigation...
  -     */
  -    public TemplateScreenMapper(boolean useCache,
  -        int cacheSize,
  -        String defaultProperty,
  -        char separator,
  -        String prefix)
  -    {
  -        super(useCache, cacheSize, defaultProperty, separator, prefix);
  -    }
  -
  -    /**
        * Check, whether the provided name exists. Returns null
        * if the screen does not exist.
        *
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org