This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 7200a0cb3a Fix indent and small bits of other formatting. No
functional change.
7200a0cb3a is described below
commit 7200a0cb3a15d0783a2ee4aa58e3514aa23dcace
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 17 19:13:53 2022 +0100
Fix indent and small bits of other formatting. No functional change.
Fixes the jakarta.* packages
---
java/javax/ejb/EJBs.java | 2 +-
java/javax/persistence/PersistenceContexts.java | 2 +-
java/javax/persistence/PersistenceUnits.java | 2 +-
java/javax/servlet/AsyncContext.java | 3 +-
java/javax/servlet/jsp/HttpJspPage.java | 2 +-
java/javax/servlet/jsp/el/ELParseException.java | 36 ++++++++----------
java/javax/servlet/jsp/el/FunctionMapper.java | 19 +++++-----
.../servlet/jsp/el/ImplicitObjectELResolver.java | 44 +++++++++++-----------
java/javax/servlet/jsp/tagext/PageData.java | 2 +-
java/javax/servlet/jsp/tagext/TagInfo.java | 31 ++++++---------
10 files changed, 65 insertions(+), 78 deletions(-)
diff --git a/java/javax/ejb/EJBs.java b/java/javax/ejb/EJBs.java
index ac112b3220..f66666f0e3 100644
--- a/java/javax/ejb/EJBs.java
+++ b/java/javax/ejb/EJBs.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface EJBs {
- EJB[] value();
+ EJB[] value();
}
diff --git a/java/javax/persistence/PersistenceContexts.java
b/java/javax/persistence/PersistenceContexts.java
index 8aa9fde81a..6c6de369e6 100644
--- a/java/javax/persistence/PersistenceContexts.java
+++ b/java/javax/persistence/PersistenceContexts.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceContexts {
- PersistenceContext[] value();
+ PersistenceContext[] value();
}
diff --git a/java/javax/persistence/PersistenceUnits.java
b/java/javax/persistence/PersistenceUnits.java
index 0d12ded4e3..ebfd3c9f64 100644
--- a/java/javax/persistence/PersistenceUnits.java
+++ b/java/javax/persistence/PersistenceUnits.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceUnits {
- PersistenceUnit[] value();
+ PersistenceUnit[] value();
}
diff --git a/java/javax/servlet/AsyncContext.java
b/java/javax/servlet/AsyncContext.java
index 30052f9e66..57335bf8ea 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -142,8 +142,7 @@ public interface AsyncContext {
* @return the newly created AsyncListener object
* @throws ServletException if the listener cannot be created
*/
- <T extends AsyncListener> T createListener(Class<T> clazz)
- throws ServletException;
+ <T extends AsyncListener> T createListener(Class<T> clazz) throws
ServletException;
/**
* Set the timeout.
diff --git a/java/javax/servlet/jsp/HttpJspPage.java
b/java/javax/servlet/jsp/HttpJspPage.java
index 5bbdc12a79..915463e381 100644
--- a/java/javax/servlet/jsp/HttpJspPage.java
+++ b/java/javax/servlet/jsp/HttpJspPage.java
@@ -55,5 +55,5 @@ public interface HttpJspPage extends JspPage {
*/
public void _jspService(HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException;
+ throws ServletException, IOException;
}
diff --git a/java/javax/servlet/jsp/el/ELParseException.java
b/java/javax/servlet/jsp/el/ELParseException.java
index a40e4e8d75..4d6335e16e 100644
--- a/java/javax/servlet/jsp/el/ELParseException.java
+++ b/java/javax/servlet/jsp/el/ELParseException.java
@@ -26,27 +26,23 @@ package javax.servlet.jsp.el;
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public class ELParseException extends ELException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
-//-------------------------------------
- /**
- * Creates an ELParseException with no detail message.
- */
- public ELParseException ()
- {
- super ();
- }
- //-------------------------------------
- /**
- * Creates an ELParseException with the provided detail message.
- *
- * @param pMessage the detail message
- **/
- public ELParseException (String pMessage)
- {
- super (pMessage);
- }
+ /**
+ * Creates an ELParseException with no detail message.
+ */
+ public ELParseException () {
+ super ();
+ }
- //-------------------------------------
+
+ /**
+ * Creates an ELParseException with the provided detail message.
+ *
+ * @param pMessage the detail message
+ */
+ public ELParseException (String pMessage) {
+ super (pMessage);
+ }
}
diff --git a/java/javax/servlet/jsp/el/FunctionMapper.java
b/java/javax/servlet/jsp/el/FunctionMapper.java
index af4f37a0b1..6e1a439c12 100644
--- a/java/javax/servlet/jsp/el/FunctionMapper.java
+++ b/java/javax/servlet/jsp/el/FunctionMapper.java
@@ -27,14 +27,13 @@ package javax.servlet.jsp.el;
*/
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public interface FunctionMapper {
- /**
- * Resolves the specified local name and prefix into a Java.lang.Method.
- * Returns null if the prefix and local name are not found.
- *
- * @param prefix the prefix of the function, or "" if no prefix.
- * @param localName the short name of the function
- * @return the result of the method mapping. Null means no entry found.
- **/
- public java.lang.reflect.Method resolveFunction(String prefix,
- String localName);
+ /**
+ * Resolves the specified local name and prefix into a Java.lang.Method.
+ * Returns null if the prefix and local name are not found.
+ *
+ * @param prefix the prefix of the function, or "" if no prefix.
+ * @param localName the short name of the function
+ * @return the result of the method mapping. Null means no entry found.
+ */
+ public java.lang.reflect.Method resolveFunction(String prefix, String
localName);
}
diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index d1311336d5..36be348b57 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -91,28 +91,28 @@ public class ImplicitObjectELResolver extends ELResolver {
.getContext(JspContext.class);
context.setPropertyResolved(base, property);
switch (idx) {
- case APPLICATIONSCOPE:
- return ScopeManager.get(page).getApplicationScope();
- case COOKIE:
- return ScopeManager.get(page).getCookie();
- case HEADER:
- return ScopeManager.get(page).getHeader();
- case HEADERVALUES:
- return ScopeManager.get(page).getHeaderValues();
- case INITPARAM:
- return ScopeManager.get(page).getInitParam();
- case PAGECONTEXT:
- return ScopeManager.get(page).getPageContext();
- case PAGESCOPE:
- return ScopeManager.get(page).getPageScope();
- case PARAM:
- return ScopeManager.get(page).getParam();
- case PARAM_VALUES:
- return ScopeManager.get(page).getParamValues();
- case REQUEST_SCOPE:
- return ScopeManager.get(page).getRequestScope();
- case SESSION_SCOPE:
- return ScopeManager.get(page).getSessionScope();
+ case APPLICATIONSCOPE:
+ return ScopeManager.get(page).getApplicationScope();
+ case COOKIE:
+ return ScopeManager.get(page).getCookie();
+ case HEADER:
+ return ScopeManager.get(page).getHeader();
+ case HEADERVALUES:
+ return ScopeManager.get(page).getHeaderValues();
+ case INITPARAM:
+ return ScopeManager.get(page).getInitParam();
+ case PAGECONTEXT:
+ return ScopeManager.get(page).getPageContext();
+ case PAGESCOPE:
+ return ScopeManager.get(page).getPageScope();
+ case PARAM:
+ return ScopeManager.get(page).getParam();
+ case PARAM_VALUES:
+ return ScopeManager.get(page).getParamValues();
+ case REQUEST_SCOPE:
+ return ScopeManager.get(page).getRequestScope();
+ case SESSION_SCOPE:
+ return ScopeManager.get(page).getSessionScope();
}
}
}
diff --git a/java/javax/servlet/jsp/tagext/PageData.java
b/java/javax/servlet/jsp/tagext/PageData.java
index 43309b2fb5..fabb4a711c 100644
--- a/java/javax/servlet/jsp/tagext/PageData.java
+++ b/java/javax/servlet/jsp/tagext/PageData.java
@@ -44,5 +44,5 @@ public abstract class PageData {
*
* @return An input stream on the document.
*/
- public abstract InputStream getInputStream();
+ public abstract InputStream getInputStream();
}
diff --git a/java/javax/servlet/jsp/tagext/TagInfo.java
b/java/javax/servlet/jsp/tagext/TagInfo.java
index 112c9a6d8a..7bda328ed5 100644
--- a/java/javax/servlet/jsp/tagext/TagInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagInfo.java
@@ -20,29 +20,24 @@ package javax.servlet.jsp.tagext;
* Tag information for a tag in a Tag Library;
* This class is instantiated from the Tag Library Descriptor file (TLD)
* and is available only at translation time.
- *
- *
-*/
+ */
public class TagInfo {
/**
* Static constant for getBodyContent() when it is JSP.
*/
-
public static final String BODY_CONTENT_JSP = "JSP";
/**
* Static constant for getBodyContent() when it is Tag dependent.
*/
-
public static final String BODY_CONTENT_TAG_DEPENDENT = "tagdependent";
/**
* Static constant for getBodyContent() when it is empty.
*/
-
public static final String BODY_CONTENT_EMPTY = "empty";
/**
@@ -217,7 +212,6 @@ public class TagInfo {
*
* @return The (short) name of the tag.
*/
-
public String getTagName() {
return tagName;
}
@@ -230,10 +224,9 @@ public class TagInfo {
* @return The array of TagAttributeInfo for this tag, or a
* zero-length array if the tag has no attributes.
*/
-
- public TagAttributeInfo[] getAttributes() {
- return attributeInfo;
- }
+ public TagAttributeInfo[] getAttributes() {
+ return attributeInfo;
+ }
/**
* Information on the scripting objects created by this tag at runtime.
@@ -244,14 +237,14 @@ public class TagInfo {
* result of getTagExtraInfo().getVariableInfo( data ), otherwise
* null.
*/
- public VariableInfo[] getVariableInfo(TagData data) {
- VariableInfo[] result = null;
- TagExtraInfo tei = getTagExtraInfo();
- if (tei != null) {
- result = tei.getVariableInfo( data );
- }
- return result;
- }
+ public VariableInfo[] getVariableInfo(TagData data) {
+ VariableInfo[] result = null;
+ TagExtraInfo tei = getTagExtraInfo();
+ if (tei != null) {
+ result = tei.getVariableInfo( data );
+ }
+ return result;
+ }
/**
* Translation-time validation of the attributes.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
