diff options
| author | Chris Goldthorpe | 2008-12-03 23:05:08 +0000 |
|---|---|---|
| committer | Chris Goldthorpe | 2008-12-03 23:05:08 +0000 |
| commit | d937672760720b03ba4f56e8dc7a352d4b5ec0d6 (patch) | |
| tree | 3690232f3287da65b9cd5c85361463fb7a78c7c0 /org.eclipse.help | |
| parent | 77aa04c3f91dbd481f77e099970f1d890705b9f4 (diff) | |
| download | eclipse.platform.ua-d937672760720b03ba4f56e8dc7a352d4b5ec0d6.tar.gz eclipse.platform.ua-d937672760720b03ba4f56e8dc7a352d4b5ec0d6.tar.xz eclipse.platform.ua-d937672760720b03ba4f56e8dc7a352d4b5ec0d6.zip | |
Bug 248079 [Help][Index] unicode sort issue in index view
Diffstat (limited to 'org.eclipse.help')
| -rw-r--r-- | org.eclipse.help/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | org.eclipse.help/src/org/eclipse/help/internal/index/IndexAssembler.java | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/org.eclipse.help/META-INF/MANIFEST.MF b/org.eclipse.help/META-INF/MANIFEST.MF index f48d28b9c..2fc1ea28b 100644 --- a/org.eclipse.help/META-INF/MANIFEST.MF +++ b/org.eclipse.help/META-INF/MANIFEST.MF @@ -52,7 +52,8 @@ Export-Package: org.eclipse.help, Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.3.0,4.0.0)";visibility:=reexport Eclipse-LazyStart: true -Import-Package: javax.xml.parsers, +Import-Package: com.ibm.icu.text;version="[3.8.0,4.0.0)", + javax.xml.parsers, javax.xml.transform, javax.xml.transform.dom, javax.xml.transform.stream, diff --git a/org.eclipse.help/src/org/eclipse/help/internal/index/IndexAssembler.java b/org.eclipse.help/src/org/eclipse/help/internal/index/IndexAssembler.java index 2cee39669..93e249eba 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/index/IndexAssembler.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/index/IndexAssembler.java @@ -31,6 +31,8 @@ import org.eclipse.help.internal.dynamic.IncludeHandler; import org.eclipse.help.internal.dynamic.ProcessorHandler; import org.eclipse.help.internal.toc.HrefUtil; +import com.ibm.icu.text.Collator; + /* * Assembles individual keyword index contributions into a complete, fully * sorted master index. @@ -185,6 +187,7 @@ public class IndexAssembler { } private class IndexComparator implements Comparator { + Collator collator = Collator.getInstance(); public int compare(Object o1, Object o2) { /* * First separate the objects into different groups by type; @@ -194,10 +197,12 @@ public class IndexAssembler { int c1 = getCategory((UAElement)o1); int c2 = getCategory((UAElement)o2); if (c1 == c2) { + // same type of object; compare alphabetically - String s1 = getLabel((UAElement)o1).toLowerCase(); - String s2 = getLabel((UAElement)o2).toLowerCase(); - return s1.compareTo(s2); + String s1 = getLabel((UAElement)o1); + String s2 = getLabel((UAElement)o2); + //return s1.compareTo(s2); + return collator.compare(s1, s2); } else { // different types; compare by type |