Author: markt
Date: Fri Jan 15 00:38:04 2010
New Revision: 899498
URL: http://svn.apache.org/viewvc?rev=899498&view=rev
Log:
API uses Set rather than EnumSet
Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=899498&r1=899497&r2=899498&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Jan 15 00:38:04 2010
@@ -19,7 +19,6 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.EnumSet;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.Map;
@@ -854,7 +853,7 @@
* TODO SERVLET3 - Add comments
*/
public void setSessionTrackingModes(
- EnumSet<SessionTrackingMode> sessionTrackingModes)
+ Set<SessionTrackingMode> sessionTrackingModes)
throws IllegalStateException, IllegalArgumentException;
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=899498&r1=899497&r2=899498&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Jan
15 00:38:04 2010
@@ -171,9 +171,9 @@
/**
* Session tracking modes
*/
- private EnumSet<SessionTrackingMode> sessionTrackingModes = null;
- private EnumSet<SessionTrackingMode> defaultSessionTrackingModes = null;
- private EnumSet<SessionTrackingMode> supportedSessionTrackingModes = null;
+ private Set<SessionTrackingMode> sessionTrackingModes = null;
+ private Set<SessionTrackingMode> defaultSessionTrackingModes = null;
+ private Set<SessionTrackingMode> supportedSessionTrackingModes = null;
// --------------------------------------------------------- Public Methods
@@ -963,7 +963,7 @@
* used by this context has the attribute <code>secure</code> set to
* <code>true</code>.
*/
- public EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes() {
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
return defaultSessionTrackingModes;
}
@@ -994,7 +994,7 @@
* Return the supplied value if one was previously set, else return the
* defaults.
*/
- public EnumSet<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
if (sessionTrackingModes != null) {
return sessionTrackingModes;
}
@@ -1014,7 +1014,7 @@
* tracking mode is requested
*/
public void setSessionTrackingModes(
- EnumSet<SessionTrackingMode> sessionTrackingModes) {
+ Set<SessionTrackingMode> sessionTrackingModes) {
if (context.getAvailable()) {
throw new IllegalStateException(
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=899498&r1=899497&r2=899498&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Fri Jan 15 00:38:04 2010
@@ -509,7 +509,7 @@
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
- public EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes() {
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (EnumSet<SessionTrackingMode>)
doPrivileged("getDefaultSessionTrackingModes", null);
@@ -519,7 +519,7 @@
}
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
- public EnumSet<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (EnumSet<SessionTrackingMode>)
doPrivileged("getEffectiveSessionTrackingModes", null);
@@ -540,7 +540,7 @@
public void setSessionTrackingModes(
- EnumSet<SessionTrackingMode> sessionTrackingModes) {
+ Set<SessionTrackingMode> sessionTrackingModes) {
if (SecurityUtil.isPackageProtectionEnabled()) {
doPrivileged("setSessionTrackingModes",
new Object[]{sessionTrackingModes});
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=899498&r1=899497&r2=899498&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Fri Jan
15 00:38:04 2010
@@ -463,12 +463,12 @@
}
- public EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes() {
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
return EnumSet.noneOf(SessionTrackingMode.class);
}
- public EnumSet<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
return EnumSet.noneOf(SessionTrackingMode.class);
}
@@ -479,7 +479,7 @@
public void setSessionTrackingModes(
- EnumSet<SessionTrackingMode> sessionTrackingModes) {
+ Set<SessionTrackingMode> sessionTrackingModes) {
// Do nothing
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
