Return-Path: 
 <dev-return-130818-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BB1CDDE95
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Sun, 26 Aug 2012 21:00:14 +0000 (UTC)
Received: (qmail 48365 invoked by uid 500); 26 Aug 2012 21:00:14 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 48300 invoked by uid 500); 26 Aug 2012 21:00:13 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 48290 invoked by uid 99); 26 Aug 2012 21:00:13 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Aug 2012 21:00:13 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Aug 2012 21:00:11 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 7423123888FE
	for <dev@tomcat.apache.org>; Sun, 26 Aug 2012 20:59:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1377517 - in
 /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile:
 AnnotationEntry.java Attribute.java JavaClass.java Unknown.java
Date: Sun, 26 Aug 2012 20:59:27 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120826205927.7423123888FE@eris.apache.org>

Author: markt
Date: Sun Aug 26 20:59:26 2012
New Revision: 1377517

URL: http://svn.apache.org/viewvc?rev=1377517&view=rev
Log:
Java 7 <>

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1377517&r1=1377516&r2=1377517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java Sun Aug 26 20:59:26 2012
@@ -54,7 +54,7 @@ public class AnnotationEntry implements 
 
         final AnnotationEntry annotationEntry = new AnnotationEntry(file.readUnsignedShort(), constant_pool);
         final int num_element_value_pairs = (file.readUnsignedShort());
-        annotationEntry.element_value_pairs = new ArrayList<ElementValuePair>();
+        annotationEntry.element_value_pairs = new ArrayList<>();
         for (int i = 0; i < num_element_value_pairs; i++) {
             annotationEntry.element_value_pairs.add(new ElementValuePair(file.readUnsignedShort(), ElementValue.readElementValue(file, constant_pool),
                     constant_pool));

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1377517&r1=1377516&r2=1377517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Sun Aug 26 20:59:26 2012
@@ -68,8 +68,7 @@ public abstract class Attribute implemen
         this.constant_pool = constant_pool;
     }
 
-    private static final Map<String,AttributeReader> readers =
-            new HashMap<String,AttributeReader>();
+    private static final Map<String,AttributeReader> readers = new HashMap<>();
 
     /*
      * Class method reads one attribute from the input data stream. This method

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1377517&r1=1377516&r2=1377517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Sun Aug 26 20:59:26 2012
@@ -156,7 +156,7 @@ public class JavaClass extends AccessFla
         if (annotationsOutOfDate) {
             // Find attributes that contain annotation data
             Attribute[] attrs = getAttributes();
-            List<AnnotationEntry> accumulatedAnnotations = new ArrayList<AnnotationEntry>();
+            List<AnnotationEntry> accumulatedAnnotations = new ArrayList<>();
             for (int i = 0; i < attrs.length; i++) {
                 Attribute attribute = attrs[i];
                 if (attribute instanceof Annotations) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java?rev=1377517&r1=1377516&r2=1377517&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java Sun Aug 26 20:59:26 2012
@@ -46,7 +46,7 @@ public final class Unknown extends Attri
     private byte[] bytes;
     private String name;
     private static final Map<String, Unknown> unknown_attributes =
-            new HashMap<String, Unknown>();
+            new HashMap<>();
 
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org