diff options
| author | acolyer <acolyer> | 2005-09-02 07:42:57 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-09-02 07:42:57 +0000 |
| commit | 372a025d85641e17d9fff734a0c2e9770fd2d55f (patch) | |
| tree | 8ae5195e38e7fa1aa8c7b0b52c1498360c557c54 /util | |
| parent | 619f8bc764e127d4f43ece87ae0e858f7329ec9e (diff) | |
| download | aspectj-372a025d85641e17d9fff734a0c2e9770fd2d55f.tar.gz aspectj-372a025d85641e17d9fff734a0c2e9770fd2d55f.zip | |
Patch files to reapply changes developed in exploring pr107313 should we ever decided to go back down that route...
Diffstat (limited to 'util')
| -rw-r--r-- | util/pr107313-SourceLocation.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/util/pr107313-SourceLocation.patch b/util/pr107313-SourceLocation.patch new file mode 100644 index 000000000..63fd61f61 --- /dev/null +++ b/util/pr107313-SourceLocation.patch @@ -0,0 +1,34 @@ +Index: src/org/aspectj/util/ConfigParser.java +=================================================================== +RCS file: /home/technology/org.aspectj/modules/util/src/org/aspectj/util/ConfigParser.java,v +retrieving revision 1.6 +diff -u -r1.6 ConfigParser.java +--- src/org/aspectj/util/ConfigParser.java 5 Aug 2004 17:31:56 -0000 1.6 ++++ src/org/aspectj/util/ConfigParser.java 2 Sep 2005 07:40:04 -0000 +@@ -21,11 +21,14 @@ + public class ConfigParser { + Location location; + protected File relativeDirectory = null; +- protected List files = new LinkedList(); ++ protected List files = new ArrayList(); ++ protected Map userFileMap = new HashMap(); // from File -> File, keys are canonical files, values are the 'user' path + private boolean fileParsed = false; + protected static String CONFIG_MSG = "build config error: "; + + public List getFiles() { return files; } ++ ++ public Map getUserFileNameMap() { return userFileMap; } + + public void parseCommandLine(String[] argsArray) throws ParseException { + location = new CommandLineLocation(); +@@ -221,7 +224,9 @@ + ret = new File(dir, name); + } + try { +- ret = ret.getCanonicalFile(); ++ File canonicalFile = ret.getCanonicalFile(); ++ userFileMap.put(canonicalFile,new File(name)); ++ ret = canonicalFile; + } catch (IOException ioEx) { + // proceed without canonicalization + // so nothing to do here |