Attachment 110627 Details for Bug 244631 – Update to Tod's patch that nulls the collation key cache

[patch] Update to Tod's patch that nulls the collation key cache

patch.txt (text/plain), 2.72 KB, created by John Arthorne

on 2008-08-21 17:50:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2008-08-21 17:50:42 EDT

Size: 2.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/views/markers/MarkerMap.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerMap.java,v
>retrieving revision 1.4
>diff -u -r1.4 MarkerMap.java
>--- src/org/eclipse/ui/internal/views/markers/MarkerMap.java	3 Apr 2008 17:40:50 -0000	1.4
>+++ src/org/eclipse/ui/internal/views/markers/MarkerMap.java	21 Aug 2008 21:49:06 -0000
>@@ -127,4 +127,14 @@
> 	public MarkerEntry[] toArray() {
> 		return markers;
> 	}
>+
>+	/**
>+	 * Clear the caches for the markers.
>+	 */
>+	void clearAttributeCaches() {
>+		for (int i = 0; i < markers.length; i++) {
>+			markers[i].clearCaches();
>+		}
>+		
>+	}
> }
>Index: src/org/eclipse/ui/internal/views/markers/MarkerEntry.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerEntry.java,v
>retrieving revision 1.12
>diff -u -r1.12 MarkerEntry.java
>--- src/org/eclipse/ui/internal/views/markers/MarkerEntry.java	30 May 2008 16:10:41 -0000	1.12
>+++ src/org/eclipse/ui/internal/views/markers/MarkerEntry.java	21 Aug 2008 21:49:06 -0000
>@@ -40,7 +40,7 @@
> 	private static final Object LOCATION_STRING = "LOCATION_STRING"; //$NON-NLS-1$
> 	Map attributeCache = new HashMap(0);
> 	private MarkerCategory category;
>-	Map collationKeys = new HashMap(0);
>+	Map collationKeys = null;
> 	private String folder;
> 	IMarker marker;
> 
>@@ -165,6 +165,8 @@
> 			return MarkerSupportInternalUtilities.EMPTY_COLLATION_KEY;
> 		CollationKey key = Collator.getInstance().getCollationKey(
> 				attributeValue);
>+		if (collationKeys == null)
>+			collationKeys = new HashMap(2);
> 		collationKeys.put(attribute, key);
> 		return key;
> 	}
>@@ -349,4 +351,12 @@
> 		this.marker = marker;
> 		attributeCache.clear();
> 	}
>+
>+	/**
>+	 * Clear the cached values for performance reasons.
>+	 */
>+	void clearCaches() {
>+		collationKeys = null;
>+		attributeCache.clear();		
>+	}
> }
>Index: src/org/eclipse/ui/internal/views/markers/CachedMarkerBuilder.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/CachedMarkerBuilder.java,v
>retrieving revision 1.22
>diff -u -r1.22 CachedMarkerBuilder.java
>--- src/org/eclipse/ui/internal/views/markers/CachedMarkerBuilder.java	29 Apr 2008 11:21:01 -0000	1.22
>+++ src/org/eclipse/ui/internal/views/markers/CachedMarkerBuilder.java	21 Aug 2008 21:49:06 -0000
>@@ -1190,6 +1190,7 @@
> 		monitor.worked(50);
> 
> 		currentMap = newMarkers;
>+		currentMap.clearAttributeCaches();
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 244631: 110564 | 110608 | 110618 | 110621 | 110627 | 111473 | 111478 | 111588 | 111595