Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 52810 invoked from network); 16 Apr 2003 18:59:39 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 16 Apr 2003 18:59:39 -0000 Received: (qmail 26976 invoked by uid 97); 16 Apr 2003 19:01:37 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 26969 invoked from network); 16 Apr 2003 19:01:36 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 16 Apr 2003 19:01:36 -0000 Received: (qmail 51904 invoked by uid 500); 16 Apr 2003 18:59:30 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 51893 invoked by uid 500); 16 Apr 2003 18:59:30 -0000 Received: (qmail 51890 invoked from network); 16 Apr 2003 18:59:30 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 16 Apr 2003 18:59:30 -0000 Received: (qmail 63732 invoked by uid 1384); 16 Apr 2003 18:59:30 -0000 Date: 16 Apr 2003 18:59:30 -0000 Message-ID: <20030416185930.63731.qmail@icarus.apache.org> From: kinman@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler SmapStratum.java SmapUtil.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N kinman 2003/04/16 11:59:30 Modified: jasper2/src/share/org/apache/jasper/compiler SmapStratum.java SmapUtil.java Log: - Output source file path as well as the source file name in the File section. Revision Changes Path 1.2 +4 -8 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapStratum.java Index: SmapStratum.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapStratum.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SmapStratum.java 16 Jul 2002 19:30:51 -0000 1.1 +++ SmapStratum.java 16 Apr 2003 18:59:29 -0000 1.2 @@ -185,7 +185,7 @@ * @param fileName the filename to add, unqualified by path. */ public void addFile(String filename) { - addFile(filename, null); + addFile(filename, filename); } /** @@ -197,9 +197,8 @@ * to a source compilation path */ public synchronized void addFile(String filename, String filePath) { - // fix this to check if duplicate name exists. - int fileIndex = fileNameList.indexOf(filename); - if (fileIndex == -1) { + int pathIndex = filePathList.indexOf(filePath); + if (pathIndex == -1) { fileNameList.add(filename); filePathList.add(filePath); } @@ -234,10 +233,7 @@ int outputStartLine, int outputLineIncrement) { // check the input - what are you doing here?? -// int fileIndex = filePathList.indexOf(inputFileName); -// if (fileIndex == -1) -// fileNameList.indexOf(inputFileName); - int fileIndex = fileNameList.indexOf(inputFileName); + int fileIndex = filePathList.indexOf(inputFileName); if (fileIndex == -1) // still throw new IllegalArgumentException( "inputFileName: " + inputFileName); 1.9 +2 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java Index: SmapUtil.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SmapUtil.java 16 Apr 2003 18:05:41 -0000 1.8 +++ SmapUtil.java 16 Apr 2003 18:59:29 -0000 1.9 @@ -591,9 +591,9 @@ } String unqualifiedName = unqualify(mark.getFile()); - smap.addFile(unqualifiedName); + smap.addFile(unqualifiedName, mark.getFile()); smap.addLineData(mark.getLineNumber(), - unqualifiedName, + mark.getFile(), inLineCount, n.getBeginJavaLine(), outIncrement); --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org