jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt SetBundleSupport.java SetLocaleSupport.java SetTimeZoneSupport.java
Date Thu, 18 Apr 2002 22:53:51 GMT
luehe       02/04/18 15:53:51

  Modified:    standard/src/org/apache/taglibs/standard/tag/common/fmt
                        SetBundleSupport.java SetLocaleSupport.java
                        SetTimeZoneSupport.java
  Log:
  Changed internal representation of 'scope' from string to int, to be consistent w/ other
actions
  
  Revision  Changes    Path
  1.6       +5 -5      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
  
  Index: SetBundleSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SetBundleSupport.java	17 Apr 2002 20:48:03 -0000	1.5
  +++ SetBundleSupport.java	18 Apr 2002 22:53:51 -0000	1.6
  @@ -83,7 +83,7 @@
       //*********************************************************************
       // Private state
   
  -    private String scope;                       // 'scope' attribute
  +    private int scope;                          // 'scope' attribute
       private String var;                         // 'var' attribute
   
   
  @@ -97,7 +97,7 @@
   
       private void init() {
   	basename = null;
  -	scope = "page";
  +	scope = PageContext.PAGE_SCOPE;
       }
   
   
  @@ -109,7 +109,7 @@
       }
   
       public void setScope(String scope) {
  -	this.scope = scope;
  +	this.scope = Util.getScope(scope);
       }
   
   
  @@ -130,10 +130,10 @@
   	}
   
   	if (var != null) {
  -	    pageContext.setAttribute(var, locCtxt, Util.getScope(scope));
  +	    pageContext.setAttribute(var, locCtxt, scope);
   	} else {
   	    Config.set(pageContext, Config.FMT_LOCALIZATIONCONTEXT, locCtxt,
  -		       Util.getScope(scope));
  +		       scope);
   	}
   
   	return EVAL_PAGE;
  
  
  
  1.7       +4 -5      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
  
  Index: SetLocaleSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SetLocaleSupport.java	17 Apr 2002 20:48:03 -0000	1.6
  +++ SetLocaleSupport.java	18 Apr 2002 22:53:51 -0000	1.7
  @@ -91,7 +91,7 @@
       //*********************************************************************
       // Private state
   
  -    private String scope;                        // 'scope' attribute
  +    private int scope;                           // 'scope' attribute
   
   
       //*********************************************************************
  @@ -104,7 +104,7 @@
   
       private void init() {
   	value = variant = null;
  -	scope = "page";
  +	scope = PageContext.PAGE_SCOPE;
       }
   
   
  @@ -112,7 +112,7 @@
       // Tag attributes known at translation time
   
       public void setScope(String scope) {
  -	this.scope = scope;
  +	this.scope = Util.getScope(scope);
       }
   
   
  @@ -134,8 +134,7 @@
   	    locale = (Locale) value;
   	}
   
  -	Config.set(pageContext, Config.FMT_LOCALE, locale,
  -		   Util.getScope(scope));
  +	Config.set(pageContext, Config.FMT_LOCALE, locale, scope);
   	setResponseLocale(pageContext, locale);
   
   	return EVAL_PAGE;
  
  
  
  1.4       +5 -6      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
  
  Index: SetTimeZoneSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SetTimeZoneSupport.java	18 Apr 2002 22:36:01 -0000	1.3
  +++ SetTimeZoneSupport.java	18 Apr 2002 22:53:51 -0000	1.4
  @@ -82,7 +82,7 @@
       //*********************************************************************
       // Private state
   
  -    private String scope;                        // 'scope' attribute
  +    private int scope;                           // 'scope' attribute
       private String var;                          // 'var' attribute
   
   
  @@ -97,7 +97,7 @@
       // resets local state
       private void init() {
   	value = var = null;
  -	scope = "page";
  +	scope = PageContext.PAGE_SCOPE;
       }
   
   
  @@ -105,7 +105,7 @@
       // Tag attributes known at translation time
   
       public void setScope(String scope) {
  -	this.scope = scope;
  +	this.scope = Util.getScope(scope);
       }
   
       public void setVar(String var) {
  @@ -132,10 +132,9 @@
   	}
   
   	if (var != null) {
  -	    pageContext.setAttribute(var, timeZone, Util.getScope(scope));
  +	    pageContext.setAttribute(var, timeZone, scope);
   	} else {
  -	    Config.set(pageContext, Config.FMT_TIMEZONE, timeZone,
  -		       Util.getScope(scope));
  +	    Config.set(pageContext, Config.FMT_TIMEZONE, timeZone, scope);
   	}
   
   	return EVAL_PAGE;
  
  
  

--
To unsubscribe, e-mail:   <mailto:taglibs-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:taglibs-dev-help@jakarta.apache.org>


Mime
View raw message