Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F0A6A638B for ; Sat, 6 Aug 2011 20:19:54 +0000 (UTC) Received: (qmail 24540 invoked by uid 500); 6 Aug 2011 20:19:54 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 24418 invoked by uid 500); 6 Aug 2011 20:19:53 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 24409 invoked by uid 99); 6 Aug 2011 20:19:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Aug 2011 20:19:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Aug 2011 20:19:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6FBF423888CC for ; Sat, 6 Aug 2011 20:19:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1154575 - in /tomcat/trunk/java/org/apache: catalina/tribes/ catalina/tribes/transport/ tomcat/util/ tomcat/util/bcel/classfile/ tomcat/util/digester/ tomcat/util/http/fileupload/ tomcat/util/http/fileupload/disk/ tomcat/util/http/fileuplo... Date: Sat, 06 Aug 2011 20:19:30 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110806201931.6FBF423888CC@eris.apache.org> Author: markt Date: Sat Aug 6 20:19:29 2011 New Revision: 1154575 URL: http://svn.apache.org/viewvc?rev=1154575&view=rev Log: Missing @Override markers Modified: tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java Sat Aug 6 20:19:29 2011 @@ -36,8 +36,10 @@ public interface MessageListener { public boolean accept(ChannelMessage msg); + @Override public boolean equals(Object listener); + @Override public int hashCode(); } Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java Sat Aug 6 20:19:29 2011 @@ -29,8 +29,6 @@ import org.apache.catalina.tribes.Member public interface MultiPointSender extends DataSender { public void sendMessage(Member[] destination, ChannelMessage data) throws ChannelException; - public void setRxBufSize(int size); - public void setTxBufSize(int size); public void setMaxRetryAttempts(int attempts); public void setDirectBuffer(boolean directBuf); public void add(Member member); Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Sat Aug 6 20:19:29 2011 @@ -594,6 +594,7 @@ public final class IntrospectionUtils { final String lext = ext; if (dir.isDirectory()) { names = dir.list(new FilenameFilter() { + @Override public boolean accept(File d, String name) { if (name.endsWith(lext)) { return true; Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java Sat Aug 6 20:19:29 2011 @@ -96,6 +96,7 @@ public class LocalVariableTable extends * @deprecated since 5.2 because multiple variables can share the * same slot, use getLocalVariable(int index, int pc) instead. */ + @java.lang.Deprecated public final LocalVariable getLocalVariable( int index ) { for (int i = 0; i < local_variable_table_length; i++) { if (local_variable_table[i].getIndex() == index) { Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java Sat Aug 6 20:19:29 2011 @@ -45,6 +45,7 @@ public abstract class RuleSetBase implem * Return the namespace URI that will be applied to all Rule instances * created from this RuleSet. */ + @Override public String getNamespaceURI() { return (this.namespaceURI); @@ -64,6 +65,7 @@ public abstract class RuleSetBase implem * @param digester Digester instance to which the new Rule instances * should be added. */ + @Override public abstract void addRuleInstances(Digester digester); Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java Sat Aug 6 20:19:29 2011 @@ -85,6 +85,7 @@ public class RulesBase implements Rules * Return the Digester instance with which this Rules instance is * associated. */ + @Override public Digester getDigester() { return (this.digester); @@ -97,6 +98,7 @@ public class RulesBase implements Rules * * @param digester The newly associated Digester instance */ + @Override public void setDigester(Digester digester) { this.digester = digester; @@ -113,6 +115,7 @@ public class RulesBase implements Rules * Return the namespace URI that will be applied to all subsequently * added Rule objects. */ + @Override public String getNamespaceURI() { return (this.namespaceURI); @@ -128,6 +131,7 @@ public class RulesBase implements Rules * subsequently added rules, or null for matching * regardless of the current namespace URI */ + @Override public void setNamespaceURI(String namespaceURI) { this.namespaceURI = namespaceURI; @@ -144,6 +148,7 @@ public class RulesBase implements Rules * @param pattern Nesting pattern to be matched for this Rule * @param rule Rule instance to be registered */ + @Override public void add(String pattern, Rule rule) { // to help users who accidently add '/' to the end of their patterns int patternLength = pattern.length(); @@ -172,6 +177,7 @@ public class RulesBase implements Rules /** * Clear all existing Rule instance registrations. */ + @Override public void clear() { cache.clear(); @@ -191,6 +197,7 @@ public class RulesBase implements Rules * or null to match regardless of namespace URI * @param pattern Nesting pattern to be matched */ + @Override public List match(String namespaceURI, String pattern) { // List rulesList = (List) this.cache.get(pattern); @@ -228,6 +235,7 @@ public class RulesBase implements Rules * in the order originally registered through the add() * method. */ + @Override public List rules() { return (this.rules); Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java Sat Aug 6 20:19:29 2011 @@ -75,11 +75,13 @@ public class WithDefaultsRulesWrapper im // --------------------------------------------------------- Properties /** Gets digester using these Rules */ + @Override public Digester getDigester() { return wrappedRules.getDigester(); } /** Sets digester using these Rules */ + @Override public void setDigester(Digester digester) { wrappedRules.setDigester(digester); Iterator it = defaultRules.iterator(); @@ -90,11 +92,13 @@ public class WithDefaultsRulesWrapper im } /** Gets namespace to apply to Rule's added */ + @Override public String getNamespaceURI() { return wrappedRules.getNamespaceURI(); } /** Sets namespace to apply to Rule's added subsequently */ + @Override public void setNamespaceURI(String namespaceURI) { wrappedRules.setNamespaceURI(namespaceURI); } @@ -111,6 +115,7 @@ public class WithDefaultsRulesWrapper im * If wrapped implementation returns any matches return those. * Otherwise, return default matches. */ + @Override public List match(String namespaceURI, String pattern) { List matches = wrappedRules.match(namespaceURI, pattern); if (matches == null || matches.isEmpty()) { @@ -137,11 +142,13 @@ public class WithDefaultsRulesWrapper im } /** Gets all rules */ + @Override public List rules() { return allRules; } /** Clears all Rule's */ + @Override public void clear() { wrappedRules.clear(); allRules.clear(); @@ -152,6 +159,7 @@ public class WithDefaultsRulesWrapper im * Adds a Rule to be fired on given pattern. * Pattern matching is delegated to wrapped implementation. */ + @Override public void add(String pattern, Rule rule) { wrappedRules.add(pattern, rule); allRules.add(rule); Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java Sat Aug 6 20:19:29 2011 @@ -639,6 +639,7 @@ public abstract class FileUploadBase { * Returns the items content type, or null. * @return Content type, if known, or null. */ + @Override public String getContentType() { return contentType; } @@ -647,6 +648,7 @@ public abstract class FileUploadBase { * Returns the items field name. * @return Field name. */ + @Override public String getFieldName() { return fieldName; } @@ -659,6 +661,7 @@ public abstract class FileUploadBase { * use the file name anyways, catch the exception and use * InvalidFileNameException#getName(). */ + @Override public String getName() { return Streams.checkFileName(name); } @@ -668,6 +671,7 @@ public abstract class FileUploadBase { * @return True, if the item is a form field, * otherwise false. */ + @Override public boolean isFormField() { return formField; } @@ -678,6 +682,7 @@ public abstract class FileUploadBase { * @return Opened input stream. * @throws IOException An I/O error occurred. */ + @Override public InputStream openStream() throws IOException { if (opened) { throw new IllegalStateException( @@ -701,6 +706,7 @@ public abstract class FileUploadBase { * Returns the file item headers. * @return The items header object */ + @Override public FileItemHeaders getHeaders() { return headers; } @@ -709,6 +715,7 @@ public abstract class FileUploadBase { * Sets the file item headers. * @param pHeaders The items header object */ + @Override public void setHeaders(FileItemHeaders pHeaders) { headers = pHeaders; } @@ -915,6 +922,7 @@ public abstract class FileUploadBase { * @return True, if one or more additional file items * are available, otherwise false. */ + @Override public boolean hasNext() throws FileUploadException, IOException { if (eof) { return false; @@ -935,6 +943,7 @@ public abstract class FileUploadBase { * @return FileItemStream instance, which provides * access to the next file item. */ + @Override public FileItemStream next() throws FileUploadException, IOException { if (eof || (!itemValid && !hasNext())) { throw new NoSuchElementException(); Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java Sat Aug 6 20:19:29 2011 @@ -960,6 +960,7 @@ public class MultipartStream { * Returns, whether the stream is closed. * @return True, if the stream is closed, otherwise false. */ + @Override public boolean isClosed() { return closed; } Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java Sat Aug 6 20:19:29 2011 @@ -229,6 +229,7 @@ public class DiskFileItem * * @throws IOException if an error occurs. */ + @Override public InputStream getInputStream() throws IOException { if (!isInMemory()) { @@ -249,6 +250,7 @@ public class DiskFileItem * @return The content type passed by the agent or null if * not defined. */ + @Override public String getContentType() { return contentType; } @@ -279,6 +281,7 @@ public class DiskFileItem * a security attack. If you intend to use the file name anyways, catch * the exception and use InvalidFileNameException#getName(). */ + @Override public String getName() { return Streams.checkFileName(fileName); } @@ -294,6 +297,7 @@ public class DiskFileItem * @return true if the file contents will be read * from memory; false otherwise. */ + @Override public boolean isInMemory() { if (cachedContent != null) { return true; @@ -307,6 +311,7 @@ public class DiskFileItem * * @return The size of the file, in bytes. */ + @Override public long getSize() { if (size >= 0) { return size; @@ -327,6 +332,7 @@ public class DiskFileItem * * @return The contents of the file as an array of bytes. */ + @Override public byte[] get() { if (isInMemory()) { if (cachedContent == null) { @@ -369,6 +375,7 @@ public class DiskFileItem * @throws UnsupportedEncodingException if the requested character * encoding is not available. */ + @Override public String getString(final String charset) throws UnsupportedEncodingException { return new String(get(), charset); @@ -384,6 +391,7 @@ public class DiskFileItem * * TODO Consider making this method throw UnsupportedEncodingException. */ + @Override public String getString() { byte[] rawdata = get(); String charset = getCharSet(); @@ -418,6 +426,7 @@ public class DiskFileItem * * @throws Exception if an error occurs. */ + @Override public void write(File file) throws Exception { if (isInMemory()) { FileOutputStream fout = null; @@ -484,6 +493,7 @@ public class DiskFileItem * collected, this method can be used to ensure that this is done at an * earlier time, thus preserving system resources. */ + @Override public void delete() { cachedContent = null; File outputFile = getStoreLocation(); @@ -502,6 +512,7 @@ public class DiskFileItem * @see #setFieldName(java.lang.String) * */ + @Override public String getFieldName() { return fieldName; } @@ -515,6 +526,7 @@ public class DiskFileItem * @see #getFieldName() * */ + @Override public void setFieldName(String fieldName) { this.fieldName = fieldName; } @@ -530,6 +542,7 @@ public class DiskFileItem * @see #setFormField(boolean) * */ + @Override public boolean isFormField() { return isFormField; } @@ -545,6 +558,7 @@ public class DiskFileItem * @see #isFormField() * */ + @Override public void setFormField(boolean state) { isFormField = state; } @@ -559,6 +573,7 @@ public class DiskFileItem * * @throws IOException if an error occurs. */ + @Override public OutputStream getOutputStream() throws IOException { if (dfos == null) { @@ -729,6 +744,7 @@ public class DiskFileItem * Returns the file item headers. * @return The file items headers. */ + @Override public FileItemHeaders getHeaders() { return headers; } @@ -737,6 +753,7 @@ public class DiskFileItem * Sets the file item headers. * @param pHeaders The file items headers. */ + @Override public void setHeaders(FileItemHeaders pHeaders) { headers = pHeaders; } Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java Sat Aug 6 20:19:29 2011 @@ -195,6 +195,7 @@ public class DiskFileItemFactory impleme * * @return The newly created file item. */ + @Override public FileItem createItem(String fieldName, String contentType, boolean isFormField, String fileName) { DiskFileItem result = new DiskFileItem(fieldName, contentType, Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java Sat Aug 6 20:19:29 2011 @@ -63,6 +63,7 @@ public class ServletRequestContext imple * * @return The character encoding for the request. */ + @Override public String getCharacterEncoding() { return request.getCharacterEncoding(); } @@ -72,6 +73,7 @@ public class ServletRequestContext imple * * @return The content type of the request. */ + @Override public String getContentType() { return request.getContentType(); } @@ -81,6 +83,7 @@ public class ServletRequestContext imple * * @return The content length of the request. */ + @Override public int getContentLength() { return request.getContentLength(); } @@ -92,6 +95,7 @@ public class ServletRequestContext imple * * @throws IOException if a problem occurs. */ + @Override public InputStream getInputStream() throws IOException { return request.getInputStream(); } Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java Sat Aug 6 20:19:29 2011 @@ -51,6 +51,7 @@ public class FileItemHeadersImpl impleme */ private final List headerNameList = new ArrayList(); + @Override public String getHeader(String name) { String nameLower = name.toLowerCase(Locale.ENGLISH); List headerValueList = headerNameToValueListMap.get(nameLower); @@ -60,10 +61,12 @@ public class FileItemHeadersImpl impleme return headerValueList.get(0); } + @Override public Iterator getHeaderNames() { return headerNameList.iterator(); } + @Override public Iterator getHeaders(String name) { String nameLower = name.toLowerCase(Locale.ENGLISH); List headerValueList = headerNameToValueListMap.get(nameLower); Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java Sat Aug 6 20:19:29 2011 @@ -137,6 +137,7 @@ public abstract class LimitedInputStream * @return True, if the stream is closed, otherwise false. * @throws IOException An I/O error occurred. */ + @Override public boolean isClosed() throws IOException { return closed; } Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java Sat Aug 6 20:19:29 2011 @@ -79,6 +79,7 @@ public class FixedNotificationFilter imp * includes the name of the attribute in this notification * */ + @Override public boolean isNotificationEnabled(Notification notification) { if (notification == null) Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Sat Aug 6 20:19:29 2011 @@ -204,6 +204,7 @@ public class Registry implements Registr * * @since 1.1 */ + @Override public void stop() { descriptorsByClass = new HashMap(); descriptors = new HashMap(); @@ -225,6 +226,7 @@ public class Registry implements Registr * * @since 1.1 */ + @Override public List loadMBeans( Object source, ClassLoader cl ) throws Exception { @@ -242,6 +244,7 @@ public class Registry implements Registr * * @param source */ + @Override public void loadMetadata(Object source ) throws Exception { loadDescriptors( null, source, null ); } @@ -275,6 +278,7 @@ public class Registry implements Registr * * @since 1.1 */ + @Override public void registerComponent(Object bean, String oname, String type) throws Exception { @@ -288,6 +292,7 @@ public class Registry implements Registr * * @since 1.1 */ + @Override public void unregisterComponent( String oname ) { try { unregisterComponent(new ObjectName(oname)); @@ -306,6 +311,7 @@ public class Registry implements Registr * @throws Exception * @since 1.1 */ + @Override public void invoke(List mbeans, String operation, boolean failFirst ) throws Exception { if( mbeans==null ) { @@ -341,6 +347,7 @@ public class Registry implements Registr * @return An unique id for the domain:name combination * @since 1.1 */ + @Override public synchronized int getId( String domain, String name) { if( domain==null) { domain=""; @@ -858,6 +865,7 @@ public class Registry implements Registr // -------------------- Registration -------------------- + @Override public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception { @@ -865,12 +873,15 @@ public class Registry implements Registr return name; } + @Override public void postRegister(Boolean registrationDone) { } + @Override public void preDeregister() throws Exception { } + @Override public void postDeregister() { } Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java?rev=1154575&r1=1154574&r2=1154575&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java Sat Aug 6 20:19:29 2011 @@ -84,10 +84,12 @@ public class MbeansSource extends Modele this.type=type; } + @Override public void setSource( Object source ) { this.source=source; } + @Override public Object getSource() { return source; } @@ -99,6 +101,7 @@ public class MbeansSource extends Modele /** Return the list of mbeans created by this source. * It can be used to implement runtime services. */ + @Override public List getMBeans() { return mbeans; } @@ -122,6 +125,7 @@ public class MbeansSource extends Modele registry.invoke(mbeans, "stop", false); } + @Override public void init() throws Exception { if( mbeans==null) execute(); if( registry==null ) registry=Registry.getRegistry(null, null); @@ -133,6 +137,7 @@ public class MbeansSource extends Modele registry.invoke(mbeans, "destroy", false); } + @Override public void load() throws Exception { execute(); // backward compat } @@ -300,6 +305,7 @@ public class MbeansSource extends Modele /** Store the mbeans. * XXX add a background thread to store it periodically */ + @Override public void save() { // XXX customize no often than ( based on standard descriptor ), etc. // It doesn't work very well if we call this on each set att - --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org