Bug 33011. Refactored access to file map for easier

testing and debugging.

1 files changed, 14 insertions, 3 deletions

diff --git a/asm/src/org/aspectj/asm/StructureModel.java b/asm/src/org/aspectj/asm/StructureModel.java
index 263a32853..17c2fbb16 100644
--- a/asm/src/org/aspectj/asm/StructureModel.java
+++ b/asm/src/org/aspectj/asm/StructureModel.java
@@ -39,16 +39,26 @@ public class StructureModel implements Serializable {
         this.root = root;
     }
 
-	public Map getFileMap() {
+	private Map getFileMap() {
         return fileMap;
     }
 
+	public void addToFileMap( Object key, Object value ){
+		fileMap.put( key, value );
+	}
+	
+	public Object findInFileMap( Object key ) {
+		return fileMap.get(key);
+	}
 
 	public void setFileMap(HashMap fileMap) {
         this.fileMap = fileMap;
     }
 
-
+	public Set getFileMapEntrySet() {
+		return fileMap.entrySet();
+	}
+	
 	public boolean isValid() {
         return root != null && fileMap != null;
     }
@@ -120,7 +130,8 @@ public class StructureModel implements Serializable {
 	            return StructureModel.NO_STRUCTURE;
 	        } else {
 	            String correctedPath = new File(sourceFile).getCanonicalPath();//.replace('\\', '/');
-	            StructureNode node = (StructureNode)getFileMap().get(correctedPath);//findFileNode(filePath, model);
+	            //StructureNode node = (StructureNode)getFileMap().get(correctedPath);//findFileNode(filePath, model);
+				StructureNode node = (StructureNode)findInFileMap(correctedPath);//findFileNode(filePath, model);
 	            if (node != null) {
 	                return node;
 	            } else {