Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2008-11-20 17:35:56 +0000
committerDani Megert2008-11-20 17:35:56 +0000
commit33ed194b75699abb073776c8d64f1080bd0b906c (patch)
tree15c6d68c8fc38a640088c74853ce17546b98e35e /org.eclipse.ui.editors
parent0331f3ddd1dcef4aff0d55865b3b445387c89e9f (diff)
downloadeclipse.platform.text-33ed194b75699abb073776c8d64f1080bd0b906c.tar.gz
eclipse.platform.text-33ed194b75699abb073776c8d64f1080bd0b906c.tar.xz
eclipse.platform.text-33ed194b75699abb073776c8d64f1080bd0b906c.zip
Fixed bug 255770: [navigation] Reading occurrence markers overlap writing markers
Diffstat (limited to 'org.eclipse.ui.editors')
-rw-r--r--org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java34
1 files changed, 1 insertions, 33 deletions
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java
index b28583e11be..49aaae47c7d 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerAnnotationPreferences.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,13 +12,9 @@ package org.eclipse.ui.texteditor;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import com.ibm.icu.text.Collator;
-
import org.osgi.framework.Bundle;
import org.eclipse.swt.graphics.RGB;
@@ -298,34 +294,6 @@ public class MarkerAnnotationPreferences {
fPreferences.add(spec);
}
}
-
- final Collator collator= Collator.getInstance();
- Collections.sort(fFragments, new Comparator() {
- /*
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(Object o1, Object o2) {
- if (o1 == o2)
- return 0;
-
- AnnotationPreference ap1= (AnnotationPreference)o1;
- AnnotationPreference ap2= (AnnotationPreference)o2;
-
- String label1= ap1.getPreferenceLabel();
- String label2= ap2.getPreferenceLabel();
-
- if (label1 == null && label2 == null)
- return 0;
-
- if (label1 == null)
- return -1;
-
- if (label2 == null)
- return 1;
-
- return collator.compare(label1, label2);
- }
- });
}
/**

Back to the top