Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java Thu Nov 5 00:58:58 2009 @@ -211,6 +211,7 @@ * @throws IOException * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method */ + @Override public synchronized void connect() throws IOException { if ( connecting || isConnected()) return; connecting = true; @@ -255,6 +256,7 @@ * * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method */ + @Override public void disconnect() { try { connecting = false;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java Thu Nov 5 00:58:58 2009 @@ -235,6 +235,7 @@ else return result; } + @Override public void connect() { //do nothing, we connect on demand setConnected(true); @@ -269,17 +270,20 @@ } + @Override public synchronized void disconnect() { setConnected(false); try {close(); }catch (Exception x){} } + @Override public void finalize() { try {disconnect(); }catch ( Exception ignore){} try {selector.close();} catch (Exception ignore) {} } + @Override public boolean keepalive() { boolean result = false; for ( Iterator<Entry<Member, NioSender>> i = nioSenders.entrySet().iterator(); i.hasNext(); ) { Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java Thu Nov 5 00:58:58 2009 @@ -60,6 +60,7 @@ } } + @Override public DataSender getNewDataSender() { try { ParallelNioSender sender = new ParallelNioSender(); @@ -70,11 +71,13 @@ } } + @Override public synchronized void disconnect() { this.connected = false; super.disconnect(); } + @Override public synchronized void connect() throws IOException { this.connected = true; super.connect(); Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java Thu Nov 5 00:58:58 2009 @@ -66,6 +66,7 @@ return super.offer(o); //forces the item onto the queue, to be used if the task is rejected } + @Override public boolean offer(Runnable o) { //we can't do any checks if (parent==null) return super.offer(o); Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java Thu Nov 5 00:58:58 2009 @@ -82,6 +82,7 @@ /** * Return the set of {...@link Role}s assigned specifically to this group. */ + @Override public Iterator<Role> getRoles() { synchronized (roles) { @@ -94,6 +95,7 @@ /** * Return the {...@link UserDatabase} within which this Group is defined. */ + @Override public UserDatabase getUserDatabase() { return (this.database); @@ -104,6 +106,7 @@ /** * Return the set of {...@link org.apache.catalina.User}s that are members of this group. */ + @Override public Iterator<User> getUsers() { ArrayList<User> results = new ArrayList<User>(); @@ -127,6 +130,7 @@ * * @param role The new role */ + @Override public void addRole(Role role) { synchronized (roles) { @@ -143,6 +147,7 @@ * * @param role The role to check */ + @Override public boolean isInRole(Role role) { synchronized (roles) { @@ -157,6 +162,7 @@ * * @param role The old role */ + @Override public void removeRole(Role role) { synchronized (roles) { @@ -169,6 +175,7 @@ /** * Remove all {...@link Role}s from those assigned to this group. */ + @Override public void removeRoles() { synchronized (roles) { @@ -181,6 +188,7 @@ /** * <p>Return a String representation of this group in XML format.</p> */ + @Override public String toString() { StringBuilder sb = new StringBuilder("<group groupname=\""); Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java Thu Nov 5 00:58:58 2009 @@ -71,6 +71,7 @@ /** * Return the {...@link UserDatabase} within which this role is defined. */ + @Override public UserDatabase getUserDatabase() { return (this.database); @@ -84,6 +85,7 @@ /** * <p>Return a String representation of this role in XML format.</p> */ + @Override public String toString() { StringBuilder sb = new StringBuilder("<role rolename=\""); Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java Thu Nov 5 00:58:58 2009 @@ -90,6 +90,7 @@ /** * Return the set of {...@link Group}s to which this user belongs. */ + @Override public Iterator<Group> getGroups() { synchronized (groups) { @@ -102,6 +103,7 @@ /** * Return the set of {...@link Role}s assigned specifically to this user. */ + @Override public Iterator<Role> getRoles() { synchronized (roles) { @@ -129,6 +131,7 @@ * * @param group The new group */ + @Override public void addGroup(Group group) { synchronized (groups) { @@ -145,6 +148,7 @@ * * @param role The new role */ + @Override public void addRole(Role role) { synchronized (roles) { @@ -161,6 +165,7 @@ * * @param group The group to check */ + @Override public boolean isInGroup(Group group) { synchronized (groups) { @@ -177,6 +182,7 @@ * * @param role The role to check */ + @Override public boolean isInRole(Role role) { synchronized (roles) { @@ -191,6 +197,7 @@ * * @param group The old group */ + @Override public void removeGroup(Group group) { synchronized (groups) { @@ -203,6 +210,7 @@ /** * Remove all {...@link Group}s from those this user belongs to. */ + @Override public void removeGroups() { synchronized (groups) { @@ -217,6 +225,7 @@ * * @param role The old role */ + @Override public void removeRole(Role role) { synchronized (roles) { @@ -229,6 +238,7 @@ /** * Remove all {...@link Role}s from those assigned to this user. */ + @Override public void removeRoles() { synchronized (roles) { @@ -246,6 +256,7 @@ * <code>username</code> or </code>name</code> for the username * property.</p> */ + @Override public String toString() { StringBuilder sb = new StringBuilder("<user username=\""); Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Thu Nov 5 00:58:58 2009 @@ -608,6 +608,7 @@ /** * Return a String representation of this UserDatabase. */ + @Override public String toString() { StringBuilder sb = new StringBuilder("MemoryUserDatabase[id="); Modified: tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java Thu Nov 5 00:58:58 2009 @@ -69,6 +69,7 @@ * @exception ClassNotFoundException if this class cannot be found * @exception IOException if an input/output error occurs */ + @Override public Class<?> resolveClass(ObjectStreamClass classDesc) throws ClassNotFoundException, IOException { try { @@ -85,6 +86,7 @@ * class descriptor. Do this using the class loader assigned to this * Context. */ + @Override protected Class<?> resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException { Modified: tomcat/trunk/java/org/apache/catalina/util/Extension.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Extension.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/Extension.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/Extension.java Thu Nov 5 00:58:58 2009 @@ -218,6 +218,7 @@ /** * Return a String representation of this object. */ + @Override public String toString() { StringBuilder sb = new StringBuilder("Extension["); Modified: tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java Thu Nov 5 00:58:58 2009 @@ -127,6 +127,7 @@ return true; } + @Override public String toString() { StringBuilder sb = new StringBuilder("ManifestResource["); Modified: tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java Thu Nov 5 00:58:58 2009 @@ -139,6 +139,7 @@ * * @exception IllegalStateException if this map is currently locked */ + @Override public void clear() { if (locked) @@ -162,6 +163,7 @@ * * @exception IllegalStateException if this map is currently locked */ + @Override public V put(K key, V value) { if (locked) @@ -181,6 +183,7 @@ * * @exception IllegalStateException if this map is currently locked */ + @Override public void putAll(Map<? extends K,? extends V> map) { if (locked) @@ -201,6 +204,7 @@ * * @exception IllegalStateException if this map is currently locked */ + @Override public V remove(Object key) { if (locked) Modified: tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java Thu Nov 5 00:58:58 2009 @@ -141,6 +141,7 @@ * * @exception IllegalStateException if this ResourceSet is locked */ + @Override public boolean add(T o) { if (locked) @@ -156,6 +157,7 @@ * * @exception IllegalStateException if this ResourceSet is locked */ + @Override public void clear() { if (locked) @@ -174,6 +176,7 @@ * * @exception IllegalStateException if this ResourceSet is locked */ + @Override public boolean remove(Object o) { if (locked) Modified: tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java Thu Nov 5 00:58:58 2009 @@ -90,6 +90,7 @@ * * @return String containing the generated XML */ + @Override public String toString() { return buffer.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Thu Nov 5 00:58:58 2009 @@ -275,6 +275,7 @@ */ private static final ThreadLocal<AccessDateStruct> currentDateStruct = new ThreadLocal<AccessDateStruct>() { + @Override protected AccessDateStruct initialValue() { return new AccessDateStruct(); } @@ -351,6 +352,7 @@ /** * Return descriptive information about this implementation. */ + @Override public String getInfo() { return (info); } @@ -535,6 +537,7 @@ * invoked inside the classloading context of this container. Unexpected * throwables will be caught and logged. */ + @Override public void backgroundProcess() { if (started && getEnabled() && writer != null && buffered) { writer.flush(); @@ -551,6 +554,7 @@ * @exception IOException if an input/output error has occurred * @exception ServletException if a servlet error has occurred */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java Thu Nov 5 00:58:58 2009 @@ -233,6 +233,7 @@ /** * Return descriptive information about this Valve implementation. */ + @Override public String getInfo() { return (info); } @@ -247,6 +248,7 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { // Perform the request @@ -293,6 +295,7 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public void event(Request request, Response response, CometEvent event) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Thu Nov 5 00:58:58 2009 @@ -79,6 +79,7 @@ /** * Return descriptive information about this Valve implementation. */ + @Override public String getInfo() { return (info); @@ -99,6 +100,7 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java Thu Nov 5 00:58:58 2009 @@ -151,6 +151,7 @@ /** * Return descriptive information about this implementation. */ + @Override public String getInfo() { return (extendedAccessLogInfo); } @@ -209,6 +210,7 @@ /** * Open the new log file for the date specified by <code>dateStamp</code>. */ + @Override protected synchronized void open() { super.open(); if (currentLogFile.length()==0) { @@ -228,6 +230,7 @@ private static final ThreadLocal<ElementTimestampStruct> currentDate = new ThreadLocal<ElementTimestampStruct>() { + @Override protected ElementTimestampStruct initialValue() { return new ElementTimestampStruct("yyyy-MM-dd"); } @@ -254,6 +257,7 @@ private static final ThreadLocal<ElementTimestampStruct> currentTime = new ThreadLocal<ElementTimestampStruct>() { + @Override protected ElementTimestampStruct initialValue() { return new ElementTimestampStruct("HH:mm:ss"); } @@ -528,6 +532,7 @@ } + @Override protected AccessLogElement[] createLogElements() { if (log.isDebugEnabled()) { log.debug("decodePattern, pattern =" + pattern); Modified: tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java Thu Nov 5 00:58:58 2009 @@ -78,6 +78,7 @@ /** * Return descriptive information about this Valve implementation. */ + @Override public String getInfo() { return (info); @@ -99,6 +100,7 @@ * @exception IOException if an input/output error occurred * @exception ServletException if a servlet error occurred */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java Thu Nov 5 00:58:58 2009 @@ -53,6 +53,7 @@ /** * Return descriptive information about this Valve implementation. */ + @Override public String getInfo() { return (info); @@ -75,6 +76,7 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java Thu Nov 5 00:58:58 2009 @@ -53,6 +53,7 @@ /** * Return descriptive information about this Valve implementation. */ + @Override public String getInfo() { return (info); @@ -75,6 +76,7 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Thu Nov 5 00:58:58 2009 @@ -173,6 +173,7 @@ /** * Return descriptive information about this Valve implementation. */ + @Override public String getInfo() { return (info); @@ -195,6 +196,7 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public abstract void invoke(Request request, Response response) throws IOException, ServletException; Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Thu Nov 5 00:58:58 2009 @@ -65,6 +65,7 @@ return null; return strcert0; } + @Override public void invoke(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Thu Nov 5 00:58:58 2009 @@ -210,6 +210,7 @@ /** * Return descriptive information about this Valve implementation. */ + @Override public String getInfo() { return (info); } @@ -224,6 +225,7 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java?rev=832945&r1=832944&r2=832945&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java Thu Nov 5 00:58:58 2009 @@ -227,6 +227,7 @@ /** * Return a String rendering of this object. */ + @Override public String toString() { StringBuilder sb = new StringBuilder(this.getClass().getName()); sb.append("["); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
