From b3740d93e8cf0e47940ca90bd80bc1026d0d6c46 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 21 Apr 2011 12:25:31 +0000 Subject: [PATCH] Fix some unused code warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1095677 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/catalina/users/MemoryUserDatabase.java | 47 +------ .../digester/AbstractObjectCreationFactory.java | 8 +- .../tomcat/util/digester/AbstractRulesImpl.java | 150 --------------------- 3 files changed, 10 insertions(+), 195 deletions(-) delete mode 100644 java/org/apache/tomcat/util/digester/AbstractRulesImpl.java diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java index 7b6120bec..a81bd598a 100644 --- a/java/org/apache/catalina/users/MemoryUserDatabase.java +++ b/java/org/apache/catalina/users/MemoryUserDatabase.java @@ -36,8 +36,8 @@ import org.apache.catalina.UserDatabase; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.ExceptionUtils; +import org.apache.tomcat.util.digester.AbstractObjectCreationFactory; import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.ObjectCreationFactory; import org.apache.tomcat.util.res.StringManager; import org.xml.sax.Attributes; @@ -683,7 +683,7 @@ public class MemoryUserDatabase implements UserDatabase { /** * Digester object creation factory for group instances. */ -class MemoryGroupCreationFactory implements ObjectCreationFactory { +class MemoryGroupCreationFactory extends AbstractObjectCreationFactory { public MemoryGroupCreationFactory(MemoryUserDatabase database) { this.database = database; @@ -722,26 +722,13 @@ class MemoryGroupCreationFactory implements ObjectCreationFactory { } private MemoryUserDatabase database = null; - - private Digester digester = null; - - @Override - public Digester getDigester() { - return (this.digester); - } - - @Override - public void setDigester(Digester digester) { - this.digester = digester; - } - } /** * Digester object creation factory for role instances. */ -class MemoryRoleCreationFactory implements ObjectCreationFactory { +class MemoryRoleCreationFactory extends AbstractObjectCreationFactory { public MemoryRoleCreationFactory(MemoryUserDatabase database) { this.database = database; @@ -759,26 +746,13 @@ class MemoryRoleCreationFactory implements ObjectCreationFactory { } private MemoryUserDatabase database = null; - - private Digester digester = null; - - @Override - public Digester getDigester() { - return (this.digester); - } - - @Override - public void setDigester(Digester digester) { - this.digester = digester; - } - } /** * Digester object creation factory for user instances. */ -class MemoryUserCreationFactory implements ObjectCreationFactory { +class MemoryUserCreationFactory extends AbstractObjectCreationFactory { public MemoryUserCreationFactory(MemoryUserDatabase database) { this.database = database; @@ -842,17 +816,4 @@ class MemoryUserCreationFactory implements ObjectCreationFactory { } private MemoryUserDatabase database = null; - - private Digester digester = null; - - @Override - public Digester getDigester() { - return (this.digester); - } - - @Override - public void setDigester(Digester digester) { - this.digester = digester; - } - } diff --git a/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java b/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java index 35dad880b..78ed8457c 100644 --- a/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java +++ b/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java @@ -24,7 +24,8 @@ import org.xml.sax.Attributes; *

Abstract base class for ObjectCreationFactory * implementations.

*/ -public abstract class AbstractObjectCreationFactory implements ObjectCreationFactory { +public abstract class AbstractObjectCreationFactory + implements ObjectCreationFactory { // ----------------------------------------------------- Instance Variables @@ -34,7 +35,7 @@ public abstract class AbstractObjectCreationFactory implements ObjectCreationFac * The associated Digester instance that was set up by * {@link FactoryCreateRule} upon initialization. */ - protected Digester digester = null; + private Digester digester = null; // --------------------------------------------------------- Public Methods @@ -48,6 +49,7 @@ public abstract class AbstractObjectCreationFactory implements ObjectCreationFac * * @throws Exception any exception thrown will be propagated upwards */ + @Override public abstract Object createObject(Attributes attributes) throws Exception; @@ -55,6 +57,7 @@ public abstract class AbstractObjectCreationFactory implements ObjectCreationFac *

Returns the {@link Digester} that was set by the * {@link FactoryCreateRule} upon initialization. */ + @Override public Digester getDigester() { return (this.digester); @@ -68,6 +71,7 @@ public abstract class AbstractObjectCreationFactory implements ObjectCreationFac * * @param digester parent Digester object */ + @Override public void setDigester(Digester digester) { this.digester = digester; diff --git a/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java b/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java deleted file mode 100644 index f0527e53c..000000000 --- a/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.tomcat.util.digester; - - -import java.util.List; - - -/** - *

AbstractRuleImpl provides basic services for Rules implementations. - * Extending this class should make it easier to create a Rules implementation.

- * - *

AbstractRuleImpl manages the Digester - * and namespaceUri properties. - * If the subclass overrides {@link #registerRule} (rather than {@link #add}), - * then the Digester and namespaceURI of the Rule - * will be set correctly before it is passed to registerRule. - * The subclass can then perform whatever it needs to do to register the rule.

- * - * @since 1.5 - */ - -public abstract class AbstractRulesImpl implements Rules { - - // ------------------------------------------------------------- Fields - - /** Digester using this Rules implementation */ - private Digester digester; - /** Namespace uri to associate with subsequent Rule's */ - private String namespaceURI; - - // ------------------------------------------------------------- Properties - - /** - * Return the Digester instance with which this Rules instance is - * associated. - */ - public Digester getDigester() { - return digester; - } - - /** - * Set the Digester instance with which this Rules instance is associated. - * - * @param digester The newly associated Digester instance - */ - public void setDigester(Digester digester) { - this.digester = digester; - } - - /** - * Return the namespace URI that will be applied to all subsequently - * added Rule objects. - */ - public String getNamespaceURI() { - return namespaceURI; - } - - /** - * Set the namespace URI that will be applied to all subsequently - * added Rule objects. - * - * @param namespaceURI Namespace URI that must match on all - * subsequently added rules, or null for matching - * regardless of the current namespace URI - */ - public void setNamespaceURI(String namespaceURI) { - this.namespaceURI = namespaceURI; - } - - // --------------------------------------------------------- Public Methods - - /** - * Registers a new Rule instance matching the specified pattern. - * This implementation sets the Digester and the - * namespaceURI on the Rule before calling {@link #registerRule}. - * - * @param pattern Nesting pattern to be matched for this Rule - * @param rule Rule instance to be registered - */ - public void add(String pattern, Rule rule) { - // set up rule - if (this.digester != null) { - rule.setDigester(this.digester); - } - - if (this.namespaceURI != null) { - rule.setNamespaceURI(this.namespaceURI); - } - - registerRule(pattern, rule); - - } - - /** - * Register rule at given pattern. - * The the Digester and namespaceURI properties of the given Rule - * can be assumed to have been set properly before this method is called. - * - * @param pattern Nesting pattern to be matched for this Rule - * @param rule Rule instance to be registered - */ - protected abstract void registerRule(String pattern, Rule rule); - - /** - * Clear all existing Rule instance registrations. - */ - public abstract void clear(); - - - /** - * Return a List of all registered Rule instances that match the specified - * nesting pattern, or a zero-length List if there are no matches. If more - * than one Rule instance matches, they must be returned - * in the order originally registered through the add() - * method. - * - * @param namespaceURI Namespace URI for which to select matching rules, - * or null to match regardless of namespace URI - * @param pattern Nesting pattern to be matched - */ - public abstract List match(String namespaceURI, String pattern); - - - /** - * Return a List of all registered Rule instances, or a zero-length List - * if there are no registered Rule instances. If more than one Rule - * instance has been registered, they must be returned - * in the order originally registered through the add() - * method. - */ - public abstract List rules(); - -} -- 2.11.0