You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

pr107313-SourceLocation.patch 1.4KB

12345678910111213141516171819202122232425262728293031323334
  1. Index: src/org/aspectj/util/ConfigParser.java
  2. ===================================================================
  3. RCS file: /home/technology/org.aspectj/modules/util/src/org/aspectj/util/ConfigParser.java,v
  4. retrieving revision 1.6
  5. diff -u -r1.6 ConfigParser.java
  6. --- src/org/aspectj/util/ConfigParser.java 5 Aug 2004 17:31:56 -0000 1.6
  7. +++ src/org/aspectj/util/ConfigParser.java 2 Sep 2005 07:40:04 -0000
  8. @@ -21,11 +21,14 @@
  9. public class ConfigParser {
  10. Location location;
  11. protected File relativeDirectory = null;
  12. - protected List files = new LinkedList();
  13. + protected List files = new ArrayList();
  14. + protected Map userFileMap = new HashMap(); // from File -> File, keys are canonical files, values are the 'user' path
  15. private boolean fileParsed = false;
  16. protected static String CONFIG_MSG = "build config error: ";
  17. public List getFiles() { return files; }
  18. +
  19. + public Map getUserFileNameMap() { return userFileMap; }
  20. public void parseCommandLine(String[] argsArray) throws ParseException {
  21. location = new CommandLineLocation();
  22. @@ -221,7 +224,9 @@
  23. ret = new File(dir, name);
  24. }
  25. try {
  26. - ret = ret.getCanonicalFile();
  27. + File canonicalFile = ret.getCanonicalFile();
  28. + userFileMap.put(canonicalFile,new File(name));
  29. + ret = canonicalFile;
  30. } catch (IOException ioEx) {
  31. // proceed without canonicalization
  32. // so nothing to do here