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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
