CVSROOT: /sources/classpath Module name: cp-tools Changes by: Andrew John Hughes <gnu_andrew> 12/02/02 02:21:12
Modified files: . : ChangeLog src/gnu/ldml : Analyzer.java DataElement.java Element.java Leaf.java ListDataElement.java Parser.java src/gnu/localegen: PropertiesGenerator.java Added files: src/gnu/ldml : Draft.java Log message: Don't overwrite elements with the same path. 2012-02-01 Andrew John Hughes <gnu_and...@member.fsf.org> * src/gnu/ldml/Analyzer.java: (flattenBranch(Element)): Make package-private. Use Map/HashMap rather than Hashtable. (getSingleElement(List<Element>)): Pick the last element with no altText from the list. (treeFlattened): Use Map rather than Hashtable. Wrap retrieval in getSingleElement calls throughout. (flattenTree()): Return a Map not a Hashtable. * src/gnu/ldml/DataElement.java: (DataElement(Parser,Element,String,Draft)): New constructor to support storing the draft level. (DataElement(Parser,Element,String,Draft,String)): Likewise, but also support storing alternative text. * src/gnu/ldml/Draft.java: Move Leaf.Draft into its own outer class. * src/gnu/ldml/Element.java: (draft): New field. (altText): Likewise. (Element(Parser,Element,String)): Documented. Now delegate to Element(Parser,Element,String,Draft,String). (Element(Parser,Element,String,Draft)): New constructor to support storing the draft level. (Element(Parser,Element,String,Draft,String)): Likewise, but also support storing alternative text. (toString()): Include draft and altText. (getAltText()): Accessor for altText. (getDraft()): Accessor for draft. * src/gnu/ldml/Leaf.java: Factor out Draft into its own class. * src/gnu/ldml/ListDataElement.java: (flattenLeaf(String)): Call Analyzer.flattenBranch rather than duplicating the functionality. * src/gnu/ldml/Parser.java: (draft): Fixed type. (Data.start(String,Attributes)): Pass draft and alt attributes to DataElement constructor. * src/gnu/localegen/PropertiesGenerator.java, (TimeZoneContent.generate(PrintWriter)): Change to work with List<Element> not Element. (addCurrencyFormatContent(Map)): Likewise. (addStringContent(Map,String,String)): Likewise. (addContextualContent(Map,String,String,String[],int,int)): New method to pick out the "format" context from a list. (computeCalendar(Map)): Adapt to work with List<Element> and call addContextualContent. (computeCollations(Map)): Adapt to work with List<Element>. (computeTimeZones(Map)): Likewise. (computeLocalNames(Map)): Likewise. (computeCurrencies(Map)): Likewise. (computeContents()): Likewise. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/cp-tools/ChangeLog?cvsroot=classpath&r1=1.75&r2=1.76 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/ldml/Analyzer.java?cvsroot=classpath&r1=1.9&r2=1.10 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/ldml/DataElement.java?cvsroot=classpath&r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/ldml/Element.java?cvsroot=classpath&r1=1.5&r2=1.6 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/ldml/Leaf.java?cvsroot=classpath&r1=1.1&r2=1.2 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/ldml/ListDataElement.java?cvsroot=classpath&r1=1.8&r2=1.9 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/ldml/Parser.java?cvsroot=classpath&r1=1.11&r2=1.12 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/ldml/Draft.java?cvsroot=classpath&rev=1.1 http://cvs.savannah.gnu.org/viewcvs/cp-tools/src/gnu/localegen/PropertiesGenerator.java?cvsroot=classpath&r1=1.12&r2=1.13