From 6edbe49fa3aaac0b32e35824247293dd4322ad41 Mon Sep 17 00:00:00 2001
From: Vladimir Hirsl <vhirsl@ca.ibm.com>
Date: Fri, 8 Apr 2005 19:35:43 +0000
Subject: [PATCH] Added offset and length parameters for index entries.
 Refactoring of AbstractIndexer. Moved old parser specific stuff to the
 appropriate subclass.

---
 .../core/index/domsourceindexer/CGenerateIndexVisitor.java  | 5 -----
 .../core/index/domsourceindexer/DOMSourceIndexerRunner.java | 6 +-----
 .../internal/core/index/sourceindexer/AbstractIndexer.java  | 1 +
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/CGenerateIndexVisitor.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/CGenerateIndexVisitor.java
index 8de88225bf7..a2add09a4ac 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/CGenerateIndexVisitor.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/CGenerateIndexVisitor.java
@@ -10,9 +10,6 @@
  ***********************************************************************/
 package org.eclipse.cdt.internal.core.index.domsourceindexer;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
 import org.eclipse.cdt.core.dom.ast.DOMException;
@@ -42,7 +39,6 @@ import org.eclipse.core.runtime.Path;
 public class CGenerateIndexVisitor extends CASTVisitor {
     private DOMSourceIndexerRunner indexer; 
     private IFile resourceFile;
-    private List problems;
     {
         shouldVisitNames          = true;
 //        shouldVisitDeclarations   = false;
@@ -64,7 +60,6 @@ public class CGenerateIndexVisitor extends CASTVisitor {
         super();
         this.indexer = indexer;
         this.resourceFile = resourceFile;
-        problems = new ArrayList();
     }
 
     /* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
index 0496adbdc21..b5cc0501204 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
@@ -37,7 +37,6 @@ import org.eclipse.cdt.core.parser.ParseError;
 import org.eclipse.cdt.core.parser.ParserLanguage;
 import org.eclipse.cdt.core.search.ICSearchConstants;
 import org.eclipse.cdt.internal.core.index.cindexstorage.ICIndexStorageConstants;
-import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.index.impl.IndexDelta;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
@@ -79,7 +78,7 @@ public class DOMSourceIndexerRunner extends AbstractIndexer {
 
     protected void indexFile(IFile file) throws IOException {
         // Add the name of the file to the index
-        IndexedFileEntry indFile = output.addIndexedFile(file.getFullPath().toString());
+        output.addIndexedFile(file.getFullPath().toString());
       
         int problems = indexer.indexProblemsEnabled(resourceFile.getProject());
         setProblemMarkersEnabled(problems);
@@ -242,8 +241,6 @@ public class DOMSourceIndexerRunner extends AbstractIndexer {
      * @see org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer#addMarkers(org.eclipse.core.resources.IFile, org.eclipse.core.resources.IFile, java.lang.Object, java.lang.Object)
      */
     protected void addMarkers(IFile tempFile, IFile originator, Object problem, Object location) {
-        String fileName;
-        int sourceLineNumber = -1;
         String errorMessage = ""; //$NON-NLS-1$
        
         if (problem instanceof IASTProblem) {
@@ -259,7 +256,6 @@ public class DOMSourceIndexerRunner extends AbstractIndexer {
         }
         if (location != null && location instanceof IASTFileLocation) {
             IASTFileLocation fileLoc = (IASTFileLocation) location;
-            fileName = fileLoc.getFileName(); 
             try {
                 //we only ever add index markers on the file, so DEPTH_ZERO is far enough
                 IMarker[] markers = tempFile.findMarkers(ICModelMarker.INDEXER_MARKER, true,IResource.DEPTH_ZERO);
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java
index 6e6b934d29c..1845088f816 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java
@@ -426,6 +426,7 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
         public AddMarkerProblem(IFile file, IFile orig, Object problem, Object location) {
             super( file, orig );
             this.problem = problem;
+            this.location = location;
         }
         public boolean isAddProblem(){
             return true;