From 0bb4c8bb9a081d9ea01e9105ee23174d0c75e894 Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Fri, 1 Feb 2008 14:19:52 +0000
Subject: [PATCH] Fix memory leak in TranslationUnitAnnotationModel

---
 .../cdt/internal/core/model/WorkingCopy.java  |  3 +-
 .../internal/ui/editor/CDocumentProvider.java | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java
index d4203a5059d..c89a1659079 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 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
@@ -130,6 +130,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy {
 			return;
 		}
 		try {
+			problemRequestor= null;
 			DestroyWorkingCopyOperation op = new DestroyWorkingCopyOperation(this);
 			op.runOperation(null);
 		} catch (CModelException e) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
index 0acbe5ffb69..30fa01ca1ee 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 QNX Software Systems and others.
+ * Copyright (c) 2002, 2008 QNX Software Systems 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
@@ -92,43 +92,46 @@ public class CDocumentProvider extends TextFileDocumentProvider {
 	static protected class ProblemAnnotation extends Annotation implements ICAnnotation {
 		private static final String INDEXER_ANNOTATION_TYPE= "org.eclipse.cdt.ui.indexmarker"; //$NON-NLS-1$
 		
-		private ITranslationUnit fTranslationUnit;
+		private final ITranslationUnit fTranslationUnit;
+		private final int fId;
+		private final boolean fIsProblem;
+		private final String[] fArguments;
+		private final String fMarkerType;
 		private List fOverlaids;
-		private IProblem fProblem;
-		
+
 		public ProblemAnnotation(IProblem problem, ITranslationUnit tu) {
-			fProblem= problem;
 			fTranslationUnit= tu;
+			setText(problem.getMessage());
+			fId= problem.getID();
+			fIsProblem= problem.isError() || problem.isWarning();
+			fArguments= isProblem() ? problem.getArguments() : null;
             setType(problem instanceof CoreSpellingProblem ?
             		SpellingAnnotation.TYPE : INDEXER_ANNOTATION_TYPE);
-		}
-		
-		/*
-		 * @see ICAnnotation#getMessage()
-		 */
-		public String getText() {
-			return fProblem.getMessage();
+			if (problem instanceof IPersistableProblem)
+				fMarkerType= ((IPersistableProblem) problem).getMarkerType();
+			else 
+				fMarkerType= null;
 		}
 		
 		/*
 		 * @see ICAnnotation#getArguments()
 		 */
 		public String[] getArguments() {
-			return isProblem() ? fProblem.getArguments() : null;
+			return fArguments;
 		}
 	
 		/*
 		 * @see ICAnnotation#getId()
 		 */
 		public int getId() {
-			return fProblem.getID();
+			return fId;
 		}
 	
 		/*
 		 * @see ICAnnotation#isProblem()
 		 */
 		public boolean isProblem() {
-			return fProblem.isError() || fProblem.isWarning();
+			return fIsProblem;
 		}
 		
 		/*
@@ -182,12 +185,10 @@ public class CDocumentProvider extends TextFileDocumentProvider {
 		}
 
 		/*
-		 * @see org.eclipse.jdt.internal.ui.javaeditor.IJavaAnnotation#getMarkerType()
+		 * @see org.eclipsecjdt.internal.ui.editor.ICAnnotation#getMarkerType()
 		 */
 		public String getMarkerType() {
-			if (fProblem instanceof IPersistableProblem)
-				return ((IPersistableProblem) fProblem).getMarkerType();
-			return null;
+			return fMarkerType;
 		}
 	}
 		
@@ -268,6 +269,7 @@ public class CDocumentProvider extends TextFileDocumentProvider {
 		
 		public void clear() {
 			fList.clear();
+			fAnchor= 0;
 		}
 	}