redoing root to be kind [java file || config file] --

 was java file kind for config files.

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index f38f4451d3658a93f883dacd4fd15542870b56f1..e5bb62aa7907c5666c20d4f2afbea255a7660566 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -193,21 +193,20 @@ public class AjBuildManager {
      
     private void setupModel() {
         String rootLabel = "<root>";
+        StructureModel model = StructureModelManager.INSTANCE.getStructureModel();
+        ProgramElementNode.Kind kind = ProgramElementNode.Kind.FILE_JAVA;
         if (buildConfig.getConfigFile() != null) {
             rootLabel = buildConfig.getConfigFile().getName();
-            StructureModelManager.INSTANCE.getStructureModel().setConfigFile(
+            model.setConfigFile(
                 buildConfig.getConfigFile().getAbsolutePath()
-            );  
+            );
+            kind = ProgramElementNode.Kind.FILE_LST;  
         }
-        StructureModelManager.INSTANCE.getStructureModel().setRoot(
-            new ProgramElementNode(
-                rootLabel,
-                ProgramElementNode.Kind.FILE_JAVA,
-                new ArrayList()));
+        model.setRoot(new ProgramElementNode(rootLabel, kind, new ArrayList()));
                 
         HashMap modelFileMap = new HashMap();
-        StructureModelManager.INSTANCE.getStructureModel().setFileMap(new HashMap());
-        setStructureModel(StructureModelManager.INSTANCE.getStructureModel());            
+        model.setFileMap(new HashMap());
+        setStructureModel(model);            
     }
     
     /** init only on initial batch compile? no file-specific options */