From c56740a804b305a0560f646963dc35181b22917c Mon Sep 17 00:00:00 2001 From: Chris Wiebe Date: Tue, 24 Aug 2004 20:54:57 +0000 Subject: [PATCH] 2004-08-24 Chris Wiebe fix sorting bug * browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java --- .../org/eclipse/cdt/core/browser/QualifiedTypeName.java | 6 ++++++ core/org.eclipse.cdt.ui/ChangeLog | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java index fb7d2c97eb1..bd2bee4da2b 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java @@ -260,6 +260,9 @@ public class QualifiedTypeName implements IQualifiedTypeName { for (int i = 0; result == 0 && i < len; ++i) { result = fSegments[i].compareTo(segments[i]); } + if (result == 0 && fSegments.length != segments.length) { + result = (fSegments.length < segments.length) ? -1 : 1; + } return result; } @@ -274,6 +277,9 @@ public class QualifiedTypeName implements IQualifiedTypeName { for (int i = 0; result == 0 && i < len; ++i) { result = fSegments[i].compareToIgnoreCase(segments[i]); } + if (result == 0 && fSegments.length != segments.length) { + result = (fSegments.length < segments.length) ? -1 : 1; + } return result; } diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index adb8f1ca0e5..c7e6357f7bc 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,8 @@ +2004-08-24 Chris Wiebe + + fix sorting bug + * browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java + 2004-08-21 Alain Magloire Hardcode The CEditor id and the ASM id for the