From 1faf03eb8605a30b89db1bc3b92b1a718e94f224 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 6 Nov 2009 23:35:46 +0000 Subject: [PATCH] Use inheritance as it makes merging easier Fix a handful of Eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@833602 13f79535-47bb-0310-9956-ffa450edef68 --- .../catalina/deploy/ApplicationParameter.java | 1 + java/org/apache/catalina/deploy/ContextEjb.java | 5 +- .../apache/catalina/deploy/ContextEnvironment.java | 1 + .../org/apache/catalina/deploy/ContextHandler.java | 4 +- .../apache/catalina/deploy/ContextLocalEjb.java | 5 +- .../apache/catalina/deploy/ContextResource.java | 4 +- .../catalina/deploy/ContextResourceEnvRef.java | 5 +- .../catalina/deploy/ContextResourceLink.java | 5 +- .../org/apache/catalina/deploy/ContextService.java | 4 +- .../apache/catalina/deploy/ContextTransaction.java | 1 + java/org/apache/catalina/deploy/ErrorPage.java | 1 + java/org/apache/catalina/deploy/FilterDef.java | 1 + .../apache/catalina/deploy/InjectionTarget.java | 1 + .../apache/catalina/deploy/MessageDestination.java | 37 ++------- .../catalina/deploy/MessageDestinationRef.java | 89 ++-------------------- .../apache/catalina/deploy/NamingResources.java | 2 + java/org/apache/catalina/deploy/ResourceBase.java | 1 + .../apache/catalina/deploy/SecurityCollection.java | 2 + .../apache/catalina/deploy/SecurityConstraint.java | 1 + java/org/apache/catalina/deploy/ServletDef.java | 1 + 20 files changed, 40 insertions(+), 131 deletions(-) diff --git a/java/org/apache/catalina/deploy/ApplicationParameter.java b/java/org/apache/catalina/deploy/ApplicationParameter.java index b4fd15e43..884c983d7 100644 --- a/java/org/apache/catalina/deploy/ApplicationParameter.java +++ b/java/org/apache/catalina/deploy/ApplicationParameter.java @@ -34,6 +34,7 @@ import java.io.Serializable; public class ApplicationParameter implements Serializable { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextEjb.java b/java/org/apache/catalina/deploy/ContextEjb.java index 0d1508886..808dab0c8 100644 --- a/java/org/apache/catalina/deploy/ContextEjb.java +++ b/java/org/apache/catalina/deploy/ContextEjb.java @@ -18,8 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of an EJB resource reference for a web application, as @@ -31,8 +29,9 @@ import java.io.Serializable; * @version $Revision$ $Date$ */ -public class ContextEjb extends ResourceBase implements Serializable { +public class ContextEjb extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextEnvironment.java b/java/org/apache/catalina/deploy/ContextEnvironment.java index 1cad1271a..74b08ec27 100644 --- a/java/org/apache/catalina/deploy/ContextEnvironment.java +++ b/java/org/apache/catalina/deploy/ContextEnvironment.java @@ -33,6 +33,7 @@ import java.util.List; public class ContextEnvironment implements Serializable, Injectable { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextHandler.java b/java/org/apache/catalina/deploy/ContextHandler.java index 8c1472e95..5fbf14aec 100644 --- a/java/org/apache/catalina/deploy/ContextHandler.java +++ b/java/org/apache/catalina/deploy/ContextHandler.java @@ -18,7 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.HashMap; @@ -31,8 +30,9 @@ import java.util.HashMap; * @author Fabien Carrion */ -public class ContextHandler extends ResourceBase implements Serializable { +public class ContextHandler extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextLocalEjb.java b/java/org/apache/catalina/deploy/ContextLocalEjb.java index 86739525c..20b50ad8e 100644 --- a/java/org/apache/catalina/deploy/ContextLocalEjb.java +++ b/java/org/apache/catalina/deploy/ContextLocalEjb.java @@ -18,8 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of a local EJB resource reference for a web application, as @@ -31,8 +29,9 @@ import java.io.Serializable; * @version $Revision$ $Date$ */ -public class ContextLocalEjb extends ResourceBase implements Serializable { +public class ContextLocalEjb extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextResource.java b/java/org/apache/catalina/deploy/ContextResource.java index e7d913bb7..fae943ee1 100644 --- a/java/org/apache/catalina/deploy/ContextResource.java +++ b/java/org/apache/catalina/deploy/ContextResource.java @@ -18,7 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; /** * Representation of a resource reference for a web application, as @@ -30,8 +29,9 @@ import java.io.Serializable; * @version $Revision$ $Date$ */ -public class ContextResource extends ResourceBase implements Serializable { +public class ContextResource extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextResourceEnvRef.java b/java/org/apache/catalina/deploy/ContextResourceEnvRef.java index da0d5ad30..3e96e8d96 100644 --- a/java/org/apache/catalina/deploy/ContextResourceEnvRef.java +++ b/java/org/apache/catalina/deploy/ContextResourceEnvRef.java @@ -18,8 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of an application resource reference, as represented in @@ -30,8 +28,9 @@ import java.io.Serializable; * @version $Revision$ $Date$ */ -public class ContextResourceEnvRef extends ResourceBase implements Serializable { +public class ContextResourceEnvRef extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextResourceLink.java b/java/org/apache/catalina/deploy/ContextResourceLink.java index 8829d8f14..76dd54bb8 100644 --- a/java/org/apache/catalina/deploy/ContextResourceLink.java +++ b/java/org/apache/catalina/deploy/ContextResourceLink.java @@ -18,8 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of a resource link for a web application, as @@ -31,8 +29,9 @@ import java.io.Serializable; * @version $Revision$ $Date$ */ -public class ContextResourceLink extends ResourceBase implements Serializable { +public class ContextResourceLink extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextService.java b/java/org/apache/catalina/deploy/ContextService.java index f75dcc925..90c5efe6e 100644 --- a/java/org/apache/catalina/deploy/ContextService.java +++ b/java/org/apache/catalina/deploy/ContextService.java @@ -18,7 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; import java.util.Iterator; import java.util.HashMap; @@ -31,8 +30,9 @@ import java.util.HashMap; * @version $Revision$ $Date$ */ -public class ContextService extends ResourceBase implements Serializable { +public class ContextService extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ContextTransaction.java b/java/org/apache/catalina/deploy/ContextTransaction.java index 889366e6f..2968bf900 100644 --- a/java/org/apache/catalina/deploy/ContextTransaction.java +++ b/java/org/apache/catalina/deploy/ContextTransaction.java @@ -33,6 +33,7 @@ import java.util.Iterator; public class ContextTransaction implements Serializable { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/ErrorPage.java b/java/org/apache/catalina/deploy/ErrorPage.java index 21b88c602..f83ad2cb7 100644 --- a/java/org/apache/catalina/deploy/ErrorPage.java +++ b/java/org/apache/catalina/deploy/ErrorPage.java @@ -34,6 +34,7 @@ import java.io.Serializable; public class ErrorPage implements Serializable { + private static final long serialVersionUID = 1L; // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/deploy/FilterDef.java b/java/org/apache/catalina/deploy/FilterDef.java index 35c71bfa0..a3ddd4056 100644 --- a/java/org/apache/catalina/deploy/FilterDef.java +++ b/java/org/apache/catalina/deploy/FilterDef.java @@ -34,6 +34,7 @@ import java.io.Serializable; public class FilterDef implements Serializable { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/InjectionTarget.java b/java/org/apache/catalina/deploy/InjectionTarget.java index 7bce05c25..d5fb0451b 100644 --- a/java/org/apache/catalina/deploy/InjectionTarget.java +++ b/java/org/apache/catalina/deploy/InjectionTarget.java @@ -29,6 +29,7 @@ public class InjectionTarget { public InjectionTarget() { + // NOOP } public InjectionTarget(String targetClass, String targetName) { diff --git a/java/org/apache/catalina/deploy/MessageDestination.java b/java/org/apache/catalina/deploy/MessageDestination.java index 46445b67a..f10cb9285 100644 --- a/java/org/apache/catalina/deploy/MessageDestination.java +++ b/java/org/apache/catalina/deploy/MessageDestination.java @@ -29,27 +29,14 @@ package org.apache.catalina.deploy; * @since Tomcat 5.0 */ -public class MessageDestination { +public class MessageDestination extends ResourceBase { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties /** - * The description of this destination. - */ - private String description = null; - - public String getDescription() { - return (this.description); - } - - public void setDescription(String description) { - this.description = description; - } - - - /** * The display name of this destination. */ private String displayName = null; @@ -78,20 +65,6 @@ public class MessageDestination { /** - * The name of this destination. - */ - private String name = null; - - public String getName() { - return (this.name); - } - - public void setName(String name) { - this.name = name; - } - - - /** * The small icon of this destination. */ private String smallIcon = null; @@ -116,7 +89,7 @@ public class MessageDestination { StringBuilder sb = new StringBuilder("MessageDestination["); sb.append("name="); - sb.append(name); + sb.append(getName()); if (displayName != null) { sb.append(", displayName="); sb.append(displayName); @@ -129,9 +102,9 @@ public class MessageDestination { sb.append(", smallIcon="); sb.append(smallIcon); } - if (description != null) { + if (getDescription() != null) { sb.append(", description="); - sb.append(description); + sb.append(getDescription()); } sb.append("]"); return (sb.toString()); diff --git a/java/org/apache/catalina/deploy/MessageDestinationRef.java b/java/org/apache/catalina/deploy/MessageDestinationRef.java index 9b17db87c..51fdfdf7c 100644 --- a/java/org/apache/catalina/deploy/MessageDestinationRef.java +++ b/java/org/apache/catalina/deploy/MessageDestinationRef.java @@ -18,10 +18,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - /** *

Representation of a message destination reference for a web application, @@ -33,27 +29,14 @@ import java.util.List; * @since Tomcat 5.0 */ -public class MessageDestinationRef implements Serializable, Injectable { - +public class MessageDestinationRef extends ResourceBase { + private static final long serialVersionUID = 1L; + // ------------------------------------------------------------- Properties /** - * The description of this destination ref. - */ - private String description = null; - - public String getDescription() { - return (this.description); - } - - public void setDescription(String description) { - this.description = description; - } - - - /** * The link of this destination ref. */ private String link = null; @@ -68,34 +51,6 @@ public class MessageDestinationRef implements Serializable, Injectable { /** - * The name of this destination ref. - */ - private String name = null; - - public String getName() { - return (this.name); - } - - public void setName(String name) { - this.name = name; - } - - - /** - * The type of this destination ref. - */ - private String type = null; - - public String getType() { - return (this.type); - } - - public void setType(String type) { - this.type = type; - } - - - /** * The usage of this destination ref. */ private String usage = null; @@ -108,17 +63,6 @@ public class MessageDestinationRef implements Serializable, Injectable { this.usage = usage; } - private List injectionTargets = new ArrayList(); - - public void addInjectionTarget(String injectionTargetName, String jndiName) { - InjectionTarget target = new InjectionTarget(injectionTargetName, jndiName); - injectionTargets.add(target); - } - - public List getInjectionTargets() { - return injectionTargets; - } - // --------------------------------------------------------- Public Methods @@ -130,22 +74,22 @@ public class MessageDestinationRef implements Serializable, Injectable { StringBuilder sb = new StringBuilder("MessageDestination["); sb.append("name="); - sb.append(name); + sb.append(getName()); if (link != null) { sb.append(", link="); sb.append(link); } - if (type != null) { + if (getType() != null) { sb.append(", type="); - sb.append(type); + sb.append(getType()); } if (usage != null) { sb.append(", usage="); sb.append(usage); } - if (description != null) { + if (getDescription() != null) { sb.append(", description="); - sb.append(description); + sb.append(getDescription()); } sb.append("]"); return (sb.toString()); @@ -153,21 +97,4 @@ public class MessageDestinationRef implements Serializable, Injectable { } - // -------------------------------------------------------- Package Methods - - - /** - * The NamingResources with which we are associated (if any). - */ - protected NamingResources resources = null; - - public NamingResources getNamingResources() { - return (this.resources); - } - - void setNamingResources(NamingResources resources) { - this.resources = resources; - } - - } diff --git a/java/org/apache/catalina/deploy/NamingResources.java b/java/org/apache/catalina/deploy/NamingResources.java index 885d481ea..b7e3280da 100644 --- a/java/org/apache/catalina/deploy/NamingResources.java +++ b/java/org/apache/catalina/deploy/NamingResources.java @@ -40,6 +40,7 @@ import org.apache.catalina.Server; public class NamingResources implements Serializable { + private static final long serialVersionUID = 1L; // ----------------------------------------------------------- Constructors @@ -48,6 +49,7 @@ public class NamingResources implements Serializable { * Create a new NamingResources instance. */ public NamingResources() { + // NOOP } diff --git a/java/org/apache/catalina/deploy/ResourceBase.java b/java/org/apache/catalina/deploy/ResourceBase.java index 79541bf00..4602b2913 100644 --- a/java/org/apache/catalina/deploy/ResourceBase.java +++ b/java/org/apache/catalina/deploy/ResourceBase.java @@ -34,6 +34,7 @@ import java.util.ArrayList; public class ResourceBase implements Serializable, Injectable { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties diff --git a/java/org/apache/catalina/deploy/SecurityCollection.java b/java/org/apache/catalina/deploy/SecurityCollection.java index 8080f55eb..d039316c2 100644 --- a/java/org/apache/catalina/deploy/SecurityCollection.java +++ b/java/org/apache/catalina/deploy/SecurityCollection.java @@ -41,6 +41,8 @@ import java.io.Serializable; public class SecurityCollection implements Serializable { + private static final long serialVersionUID = 1L; + // ----------------------------------------------------------- Constructors diff --git a/java/org/apache/catalina/deploy/SecurityConstraint.java b/java/org/apache/catalina/deploy/SecurityConstraint.java index ade3d0878..36958a4c3 100644 --- a/java/org/apache/catalina/deploy/SecurityConstraint.java +++ b/java/org/apache/catalina/deploy/SecurityConstraint.java @@ -38,6 +38,7 @@ import java.io.Serializable; public class SecurityConstraint implements Serializable { + private static final long serialVersionUID = 1L; // ----------------------------------------------------------- Constructors diff --git a/java/org/apache/catalina/deploy/ServletDef.java b/java/org/apache/catalina/deploy/ServletDef.java index 4a42b1178..cad08bba0 100644 --- a/java/org/apache/catalina/deploy/ServletDef.java +++ b/java/org/apache/catalina/deploy/ServletDef.java @@ -33,6 +33,7 @@ import java.io.Serializable; public class ServletDef implements Serializable { + private static final long serialVersionUID = 1L; // ------------------------------------------------------------- Properties -- 2.11.0