- Revision
- 276
- Author
- gas
- Date
- 2007-07-24 13:22:39 -0500 (Tue, 24 Jul 2007)
Log Message
Removing org.apache package
Modified Paths
- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/DateTag.java
- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/TimeTag.java
Added Paths
Removed Paths
Diff
Deleted: trunk/extensions/taglib/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleSupport.java (275 => 276)
--- trunk/extensions/taglib/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleSupport.java 2007-07-23 12:26:16 UTC (rev 275) +++ trunk/extensions/taglib/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleSupport.java 2007-07-24 18:22:39 UTC (rev 276) @@ -1,57 +0,0 @@ -package org.apache.taglibs.standard.tag.common.fmt; - -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.jstl.core.Config; -import java.util.Locale; - -public class LocaleSupport { - - public Locale getFormattingLocale(PageContext pc) { - Object configuredLocale = Config.find(pc, Config.FMT_LOCALE); - if (configuredLocale == null) { - configuredLocale = Config.find(pc, Config.FMT_FALLBACK_LOCALE); - } - if (configuredLocale instanceof Locale) { - return (Locale) configuredLocale; - } else if (configuredLocale instanceof String) { - return stringToLocale((String) configuredLocale); - } else { - return pc.getRequest().getLocale(); - } - - } - - /** - * Extracted from XStream project, copyright Joe Walnes - * - * @param str the string to convert - * @return the locale - */ - private Locale stringToLocale(String str) { - int[] underscorePositions = underscorePositions(str); - String language, country, variant; - if (underscorePositions[0] == -1) { // "language" - language = str; - country = ""; - variant = ""; - } else if (underscorePositions[1] == -1) { // "language_country" - language = str.substring(0, underscorePositions[0]); - country = str.substring(underscorePositions[0] + 1); - variant = ""; - } else { // "language_country_variant" - language = str.substring(0, underscorePositions[0]); - country = str.substring(underscorePositions[0] + 1, underscorePositions[1]); - variant = str.substring(underscorePositions[1] + 1); - } - return new Locale(language, country, variant); - } - - private int[] underscorePositions(String in) { - int[] result = new int[2]; - for (int i = 0; i < result.length; i++) { - int last = i == 0 ? 0 : result[i - 1]; - result[i] = in.indexOf('_', last + 1); - } - return result; - } -}
Copied: trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/LocaleSupport.java (from rev 275, trunk/extensions/taglib/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleSupport.java) (0 => 276)
--- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/LocaleSupport.java (rev 0) +++ trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/LocaleSupport.java 2007-07-24 18:22:39 UTC (rev 276) @@ -0,0 +1,57 @@ +package org.codehaus.waffle.taglib; + +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.jstl.core.Config; +import java.util.Locale; + +public class LocaleSupport { + + public Locale getFormattingLocale(PageContext pc) { + Object configuredLocale = Config.find(pc, Config.FMT_LOCALE); + if (configuredLocale == null) { + configuredLocale = Config.find(pc, Config.FMT_FALLBACK_LOCALE); + } + if (configuredLocale instanceof Locale) { + return (Locale) configuredLocale; + } else if (configuredLocale instanceof String) { + return stringToLocale((String) configuredLocale); + } else { + return pc.getRequest().getLocale(); + } + + } + + /** + * Extracted from XStream project, copyright Joe Walnes + * + * @param str the string to convert + * @return the locale + */ + private Locale stringToLocale(String str) { + int[] underscorePositions = underscorePositions(str); + String language, country, variant; + if (underscorePositions[0] == -1) { // "language" + language = str; + country = ""; + variant = ""; + } else if (underscorePositions[1] == -1) { // "language_country" + language = str.substring(0, underscorePositions[0]); + country = str.substring(underscorePositions[0] + 1); + variant = ""; + } else { // "language_country_variant" + language = str.substring(0, underscorePositions[0]); + country = str.substring(underscorePositions[0] + 1, underscorePositions[1]); + variant = str.substring(underscorePositions[1] + 1); + } + return new Locale(language, country, variant); + } + + private int[] underscorePositions(String in) { + int[] result = new int[2]; + for (int i = 0; i < result.length; i++) { + int last = i == 0 ? 0 : result[i - 1]; + result[i] = in.indexOf('_', last + 1); + } + return result; + } +}
Modified: trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/DateTag.java (275 => 276)
--- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/DateTag.java 2007-07-23 12:26:16 UTC (rev 275) +++ trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/DateTag.java 2007-07-24 18:22:39 UTC (rev 276) @@ -1,6 +1,6 @@ package org.codehaus.waffle.taglib.form; -import org.apache.taglibs.standard.tag.common.fmt.LocaleSupport; +import org.codehaus.waffle.taglib.LocaleSupport; import javax.servlet.jsp.JspException; import javax.servlet.jsp.el.ELException;
Modified: trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/TimeTag.java (275 => 276)
--- trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/TimeTag.java 2007-07-23 12:26:16 UTC (rev 275) +++ trunk/extensions/taglib/src/main/java/org/codehaus/waffle/taglib/form/TimeTag.java 2007-07-24 18:22:39 UTC (rev 276) @@ -1,6 +1,6 @@ package org.codehaus.waffle.taglib.form; -import org.apache.taglibs.standard.tag.common.fmt.LocaleSupport; +import org.codehaus.waffle.taglib.LocaleSupport; import javax.servlet.jsp.JspException; import javax.servlet.jsp.el.ELException;
To unsubscribe from this list please visit:
