tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler SmapStratum.java SmapUtil.java
Date Wed, 16 Apr 2003 18:59:30 GMT
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


Mime
View raw message