svn commit: r1797536 - in /tomcat/trunk: java/org/apache/jasper/compiler/SmapStratum.java java/org/apache/jasper/compiler/SmapUtil.java test/org/apache/jasper/compiler/TestSmapGenerator.java

[markt]

Author: markt
Date: Sat Jun  3 20:39:17 2017
New Revision: 1797536

URL: http://svn.apache.org/viewvc?rev=1797536&view=rev
Log:
JSP is the only startum used by Jasper. Hard code the name and deprecated the 
constructor that allows any name.

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
    tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
    tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java?rev=1797536&r1=1797535&r2=1797536&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java Sat Jun  3 
20:39:17 2017
@@ -123,11 +123,21 @@ public class SmapStratum {
     // Constructor
 
     /**
+     * Constructs a new SmapStratum object with the stratum name JSP.
+     */
+    public SmapStratum() {
+        this("JSP");
+    }
+
+    /**
      * Constructs a new SmapStratum object for the given stratum name
      * (e.g., JSP).
      *
      * @param stratumName the name of the stratum (e.g., JSP)
+     *
+     * @deprecated Use the no-arg constructor
      */
+    @Deprecated
     public SmapStratum(String stratumName) {
         this.stratumName = stratumName;
         fileNameList = new ArrayList<>();

Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1797536&r1=1797535&r2=1797536&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Sat Jun  3 
20:39:17 2017
@@ -80,7 +80,7 @@ public class SmapUtil {
         SmapGenerator g = new SmapGenerator();
 
         // now, assemble info about our own stratum (JSP) using JspLineMap
-        SmapStratum s = new SmapStratum("JSP");
+        SmapStratum s = new SmapStratum();
 
         g.setOutputFileName(unqualify(ctxt.getServletJavaFileName()));
 
@@ -683,7 +683,7 @@ public class SmapUtil {
         public void doVisit(Node n) {
             String inner = n.getInnerClassName();
             if (inner != null && !map.containsKey(inner)) {
-                map.put(inner, new SmapStratum("JSP"));
+                map.put(inner, new SmapStratum());
             }
         }
 

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java?rev=1797536&r1=1797535&r2=1797536&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java Sat Jun 
 3 20:39:17 2017
@@ -27,7 +27,7 @@ public class TestSmapGenerator {
 
         SmapGenerator g = new SmapGenerator();
         g.setOutputFileName("foo.java");
-        SmapStratum s = new SmapStratum("JSP");
+        SmapStratum s = new SmapStratum();
         s.addFile("foo.jsp");
         s.addFile("bar.jsp", "/foo/foo/bar.jsp");
         s.addLineData(1, "foo.jsp", 1, 1, 1);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org