Author: markt
Date: Sat Jul 21 18:24:12 2012
New Revision: 1364140
URL: http://svn.apache.org/viewvc?rev=1364140&view=rev
Log:
Code clean-up
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1364140&r1=1364139&r2=1364140&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Sat Jul 21
18:24:12 2012
@@ -170,7 +170,7 @@ public final class Bootstrap {
value = replace(value);
- List<Repository> repositories = new ArrayList<Repository>();
+ List<Repository> repositories = new ArrayList<>();
StringTokenizer tokenizer = new StringTokenizer(value, ",");
while (tokenizer.hasMoreElements()) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1364140&r1=1364139&r2=1364140&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sat Jul 21
18:24:12 2012
@@ -291,9 +291,8 @@ public class Catalina {
Digester digester = new Digester();
digester.setValidating(false);
digester.setRulesValidation(true);
- HashMap<Class<?>, List<String>> fakeAttributes =
- new HashMap<Class<?>, List<String>>();
- ArrayList<String> attrs = new ArrayList<String>();
+ HashMap<Class<?>, List<String>> fakeAttributes = new HashMap<>();
+ ArrayList<String> attrs = new ArrayList<>();
attrs.add("className");
fakeAttributes.put(Object.class, attrs);
digester.setFakeAttributes(fakeAttributes);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
