luehe 2002/09/04 16:45:29
Modified: jasper2/src/share/org/apache/jasper/compiler Collector.java
Generator.java Node.java
Log:
Renamed "isHasXXX()" to "hasXXX()"
Revision Changes Path
1.5 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java
Index: Collector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Collector.java 21 Aug 2002 01:53:28 -0000 1.4
+++ Collector.java 4 Sep 2002 23:45:29 -0000 1.5
@@ -198,7 +198,7 @@
// Record if the tag element and its body contains any scriptlet.
ci.setScriptless(! scriptingElementSeen);
- ci.setHasUsebean(usebeanSeen);
+ ci.setHasUseBean(usebeanSeen);
ci.setHasIncludeAction(includeActionSeen);
ci.setHasSetProperty(setPropertySeen);
ci.setHasScriptingVars(hasScriptingVars);
1.89 +6 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Generator.java 4 Sep 2002 16:39:23 -0000 1.88
+++ Generator.java 4 Sep 2002 23:45:29 -0000 1.89
@@ -2773,14 +2773,14 @@
// "jsp.error.internal.unexpected_node_type" ) );
}
- if (ci.isHasUsebean()) {
+ if (ci.hasUseBean()) {
out.printil("HttpSession session = pageContext.getSession();");
out.printil("ServletContext application =
pageContext.getServletContext();");
}
- if (ci.isHasUsebean() || ci.isHasIncludeAction() || ci.isHasSetProperty()) {
+ if (ci.hasUseBean() || ci.hasIncludeAction() || ci.hasSetProperty()) {
out.printil("HttpServletRequest request =
(HttpServletRequest)pageContext.getRequest();");
}
- if (ci.isHasIncludeAction()) {
+ if (ci.hasIncludeAction()) {
out.printil("HttpServletResponse response =
(HttpServletResponse)pageContext.getResponse();");
}
}
1.32 +10 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
Index: Node.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Node.java 24 Aug 2002 21:42:34 -0000 1.31
+++ Node.java 4 Sep 2002 23:45:29 -0000 1.32
@@ -908,7 +908,7 @@
public static class ChildInfo {
private boolean scriptless; // true if the tag and its body
// contians no scripting elements.
- private boolean hasUsebean;
+ private boolean hasUseBean;
private boolean hasIncludeAction;
private boolean hasSetProperty;
private boolean hasScriptingVars;
@@ -921,19 +921,19 @@
return scriptless;
}
- public void setHasUsebean(boolean u) {
- hasUsebean = u;
+ public void setHasUseBean(boolean u) {
+ hasUseBean = u;
}
- public boolean isHasUsebean() {
- return hasUsebean;
+ public boolean hasUseBean() {
+ return hasUseBean;
}
public void setHasIncludeAction(boolean i) {
hasIncludeAction = i;
}
- public boolean isHasIncludeAction() {
+ public boolean hasIncludeAction() {
return hasIncludeAction;
}
@@ -941,7 +941,7 @@
hasSetProperty = s;
}
- public boolean isHasSetProperty() {
+ public boolean hasSetProperty() {
return hasSetProperty;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
