From 34d0434b16321faf8a08240704db3cdadbdb0b45 Mon Sep 17 00:00:00 2001 From: wisberg Date: Mon, 5 May 2003 15:07:36 +0000 Subject: [PATCH] redoing root to be kind [java file || config file] -- was java file kind for config files. --- .../internal/core/builder/AjBuildManager.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) 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 f38f4451d..e5bb62aa7 100644 --- 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 = ""; + 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 */ -- 2.39.5