You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/03 19:39:39 UTC
[tomcat] branch master updated: Refactor to remove unnecessary
Constants class
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 7a784b1 Refactor to remove unnecessary Constants class
7a784b1 is described below
commit 7a784b1fce0adba3118b99d8ccaab2e1b70eec43
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 3 20:39:19 2020 +0100
Refactor to remove unnecessary Constants class
---
java/org/apache/catalina/loader/Constants.java | 26 ----------------------
.../catalina/loader/WebappClassLoaderBase.java | 3 +--
java/org/apache/catalina/loader/WebappLoader.java | 3 +--
3 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/java/org/apache/catalina/loader/Constants.java b/java/org/apache/catalina/loader/Constants.java
deleted file mode 100644
index 8407282..0000000
--- a/java/org/apache/catalina/loader/Constants.java
+++ /dev/null
@@ -1,26 +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.catalina.loader;
-
-
-public class Constants {
-
- public static final String Package = "org.apache.catalina.loader";
-
-}
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 158d5c5..f30c793 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -194,8 +194,7 @@ public abstract class WebappClassLoaderBase extends URLClassLoader
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(WebappClassLoaderBase.class);
// ----------------------------------------------------------- Constructors
diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java
index 604d133..2727a31 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -105,8 +105,7 @@ public class WebappLoader extends LifecycleMBeanBase
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(WebappLoader.class);
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org