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 2012/03/15 22:22:11 UTC
svn commit: r1301210 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/deploy/ContextHandler.java
java/org/apache/catalina/deploy/ResourceBase.java
java/org/apache/catalina/manager/HTMLManagerServlet.java
Author: markt
Date: Thu Mar 15 21:22:10 2012
New Revision: 1301210
URL: http://svn.apache.org/viewvc?rev=1301210&view=rev
Log:
Simplify merge-info
Port some:
- use of final
- whitespace clean-up
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 21:22:10 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542
-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298
592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547
,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298
794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java?rev=1301210&r1=1301209&r2=1301210&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java Thu Mar 15 21:22:10 2012
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.deploy;
import java.util.ArrayList;
@@ -29,7 +27,6 @@ import java.util.Iterator;
*
* @author Fabien Carrion
*/
-
public class ContextHandler extends ResourceBase {
private static final long serialVersionUID = 1L;
@@ -59,7 +56,8 @@ public class ContextHandler extends Reso
* soapHeader[0] : namespaceURI
* soapHeader[1] : localpart
*/
- private HashMap<String, String> soapHeaders = new HashMap<String, String>();
+ private final HashMap<String, String> soapHeaders =
+ new HashMap<String, String>();
public Iterator<String> getLocalparts() {
return soapHeaders.keySet().iterator();
@@ -83,7 +81,7 @@ public class ContextHandler extends Reso
/**
* The soapRole.
*/
- private ArrayList<String> soapRoles = new ArrayList<String>();
+ private final ArrayList<String> soapRoles = new ArrayList<String>();
public String getSoapRole(int i) {
return this.soapRoles.get(i);
@@ -100,7 +98,7 @@ public class ContextHandler extends Reso
/**
* The portName.
*/
- private ArrayList<String> portNames = new ArrayList<String>();
+ private final ArrayList<String> portNames = new ArrayList<String>();
public String getPortName(int i) {
return this.portNames.get(i);
@@ -165,8 +163,6 @@ public class ContextHandler extends Reso
((soapRoles == null) ? 0 : soapRoles.hashCode());
return result;
}
-
-
@Override
public boolean equals(Object obj) {
if (this == obj) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java?rev=1301210&r1=1301209&r2=1301210&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java Thu Mar 15 21:22:10 2012
@@ -83,7 +83,8 @@ public class ResourceBase implements Ser
/**
* Holder for our configured properties.
*/
- private HashMap<String, Object> properties = new HashMap<String, Object>();
+ private final HashMap<String, Object> properties =
+ new HashMap<String, Object>();
/**
* Return a configured property.
@@ -113,7 +114,7 @@ public class ResourceBase implements Ser
return properties.keySet().iterator();
}
- private List<InjectionTarget> injectionTargets = new ArrayList<InjectionTarget>();
+ private final List<InjectionTarget> injectionTargets = new ArrayList<InjectionTarget>();
@Override
public void addInjectionTarget(String injectionTargetName, String jndiName) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1301210&r1=1301209&r2=1301210&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu Mar 15 21:22:10 2012
@@ -808,8 +808,8 @@ public final class HTMLManagerServlet ex
@Override
public String getServletInfo() {
return "HTMLManagerServlet, Copyright (c) 1999-2012, The Apache Software Foundation";
- }
-
+ }
+
/**
* @see javax.servlet.GenericServlet#init()
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org