diff options
| author | paltherr <paltherr@epfl.ch> | 2004-02-29 23:59:42 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-02-29 23:59:42 +0000 |
| commit | b3d9ef712649edbe32bc7c52b903a6cba31fe168 (patch) | |
| tree | d1de5efa4ef5e9423c4d48e022aca480f83bd967 /sources | |
| parent | dc15aa8a2727e184157da4fdd8f1b718fd9b2b0a (diff) | |
| download | scala-b3d9ef712649edbe32bc7c52b903a6cba31fe168.tar.gz scala-b3d9ef712649edbe32bc7c52b903a6cba31fe168.tar.bz2 scala-b3d9ef712649edbe32bc7c52b903a6cba31fe168.zip | |
- Removed use of Symbol.fullName
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scala/tools/scaladoc/ScalaSearch.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sources/scala/tools/scaladoc/ScalaSearch.java b/sources/scala/tools/scaladoc/ScalaSearch.java index e6eb0394d7..7c9ac8f22f 100644 --- a/sources/scala/tools/scaladoc/ScalaSearch.java +++ b/sources/scala/tools/scaladoc/ScalaSearch.java @@ -236,8 +236,18 @@ public class ScalaSearch { public int compare(Object o1, Object o2) { Symbol symbol1 = (Symbol) o1; Symbol symbol2 = (Symbol) o2; - String name1 = symbol1.fullName().toString(); - String name2 = symbol2.fullName().toString(); + if (symbol1 == symbol2) return 0; + if (symbol1.isRoot()) return -1; + if (symbol2.isRoot()) return +1; + if (symbol1.isNone()) return -1; + if (symbol2.isNone()) return +1; + if (symbol1.isError()) return -1; + if (symbol2.isError()) return +1; + int owners = compare(symbol1.owner(), symbol2.owner()); + if (owners < 0) return -1; + if (owners > 0) return +1; + String name1 = symbol1.nameString(); + String name2 = symbol2.nameString(); return name1.compareTo(name2); } public boolean equals(Object o) { |