Skip to content

Commit 09feb4d

Browse files
ctruedenctrueden
committed
Use diamond syntax
Thank you Java 7!
1 parent da2e646 commit 09feb4d

110 files changed

Lines changed: 282 additions & 282 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/org/scijava/AbstractBasicDetails.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public abstract class AbstractBasicDetails implements BasicDetails {
5353
private String description;
5454

5555
/** Table of extra key/value pairs. */
56-
private final Map<String, String> values = new HashMap<String, String>();
56+
private final Map<String, String> values = new HashMap<>();
5757

5858
// -- Object methods --
5959

‎src/main/java/org/scijava/annotations/AbstractIndexWriter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
public abstract class AbstractIndexWriter {
6262

6363
private final Map<String, Map<String, Object>> map =
64-
new ConcurrentSkipListMap<String, Map<String, Object>>();
64+
new ConcurrentSkipListMap<>();
6565

6666
protected synchronized boolean foundAnnotations() {
6767
return !map.isEmpty();
@@ -72,10 +72,10 @@ protected synchronized void add(final Map<String, Object> annotationValues,
7272
{
7373
Map<String, Object> list = map.get(annotationName);
7474
if (list == null) {
75-
list = new LinkedHashMap<String, Object>();
75+
list = new LinkedHashMap<>();
7676
map.put(annotationName, list);
7777
}
78-
final Map<String, Object> o = new TreeMap<String, Object>();
78+
final Map<String, Object> o = new TreeMap<>();
7979
o.put("class", className);
8080
o.put("values", annotationValues);
8181
list.put(className, o);
@@ -128,7 +128,7 @@ protected synchronized void merge(final String annotationName,
128128
}
129129
Map<String, Object> m = map.get(annotationName);
130130
if (m == null) {
131-
m = new LinkedHashMap<String, Object>();
131+
m = new LinkedHashMap<>();
132132
map.put(annotationName, m);
133133
}
134134
/*
@@ -184,7 +184,7 @@ else if (o instanceof Enum) {
184184
}
185185

186186
protected <A extends Annotation> Map<String, Object> adapt(A annotation) {
187-
Map<String, Object> result = new TreeMap<String, Object>();
187+
Map<String, Object> result = new TreeMap<>();
188188
for (Method method : annotation.annotationType().getMethods())
189189
try {
190190
if (method.getDeclaringClass() == annotation.annotationType()) {
@@ -204,7 +204,7 @@ protected <A extends Annotation> Map<String, Object> adapt(A annotation) {
204204
}
205205

206206
private static Map<String, Object> adapt(Enum<?> e) {
207-
Map<String, Object> result = new TreeMap<String, Object>();
207+
Map<String, Object> result = new TreeMap<>();
208208
result.put("enum", e.getClass().getName());
209209
result.put("value", e.name());
210210
return result;

‎src/main/java/org/scijava/annotations/AnnotationCombiner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void combine(File outputDirectory) throws Exception {
8787

8888
/** Scans for annotations files in every resource on the classpath. */
8989
public Set<String> getAnnotationFiles() throws IOException {
90-
final HashSet<String> files = new HashSet<String>();
90+
final HashSet<String> files = new HashSet<>();
9191

9292
for (final String prefix : new String[] { PREFIX, LEGACY_PREFIX }) {
9393
final Enumeration<URL> directories =

‎src/main/java/org/scijava/annotations/AnnotationProcessor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public boolean process(final Set<? extends TypeElement> elements,
111111
private class Writer extends AbstractIndexWriter implements StreamFactory {
112112

113113
private final Map<String, List<Element>> originatingElements =
114-
new HashMap<String, List<Element>>();
114+
new HashMap<>();
115115
private final Filer filer = processingEnv.getFiler();
116116
private final Elements utils = processingEnv.getElementUtils();
117117
private final Types typeUtils = processingEnv.getTypeUtils();
@@ -124,7 +124,7 @@ public void add(final TypeElement element) {
124124
// remember originating elements
125125
List<Element> originating = originatingElements.get(annotationName);
126126
if (originating == null) {
127-
originating = new ArrayList<Element>();
127+
originating = new ArrayList<>();
128128
originatingElements.put(annotationName, originating);
129129
}
130130

@@ -159,7 +159,7 @@ private Map<String, Object> adapt(
159159
final List<? extends AnnotationMirror> mirrors,
160160
final TypeMirror annotationType)
161161
{
162-
final Map<String, Object> result = new TreeMap<String, Object>();
162+
final Map<String, Object> result = new TreeMap<>();
163163
for (final AnnotationMirror mirror : mirrors) {
164164
if (typeUtils.isSameType(mirror.getAnnotationType(), annotationType)) {
165165
return (Map<String, Object>) adapt(mirror);
@@ -172,7 +172,7 @@ private Map<String, Object> adapt(
172172
protected Object adapt(final Object o) {
173173
if (o instanceof AnnotationMirror) {
174174
final AnnotationMirror mirror = (AnnotationMirror) o;
175-
final Map<String, Object> result = new TreeMap<String, Object>();
175+
final Map<String, Object> result = new TreeMap<>();
176176
for (final Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : mirror
177177
.getElementValues().entrySet())
178178
{
@@ -184,7 +184,7 @@ protected Object adapt(final Object o) {
184184
}
185185
else if (o instanceof List) {
186186
final List<?> list = (List<?>) o;
187-
final List<Object> result = new ArrayList<Object>(list.size());
187+
final List<Object> result = new ArrayList<>(list.size());
188188
for (final Object item : list) {
189189
result.add(adapt(item));
190190
}
@@ -197,7 +197,7 @@ else if (o instanceof TypeMirror) {
197197
}
198198
else if (o instanceof VariableElement) {
199199
final VariableElement element = (VariableElement) o;
200-
final Map<String, Object> result = new TreeMap<String, Object>();
200+
final Map<String, Object> result = new TreeMap<>();
201201
final String enumName =
202202
utils.getBinaryName((TypeElement) element.getEnclosingElement())
203203
.toString();

‎src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private String getName() {
204204

205205
private Map<String, Map<String, Object>> getAnnotations() {
206206
final Map<String, Map<String, Object>> annotations =
207-
new TreeMap<String, Map<String, Object>>();
207+
new TreeMap<>();
208208
for (final Attribute attr : attributes) {
209209
if ("RuntimeVisibleAnnotations".equals(attr.getName())) {
210210
final byte[] buf = attr.attribute;
@@ -215,7 +215,7 @@ private Map<String, Map<String, Object>> getAnnotations() {
215215
raw2className(getStringConstant(getU2(buf, offset)));
216216
offset += 2;
217217
final Map<String, Object> values =
218-
new TreeMap<String, Object>();
218+
new TreeMap<>();
219219
annotations.put(className, values);
220220
offset = parseAnnotationValues(buf, offset, values);
221221
}
@@ -297,7 +297,7 @@ private int parseAnnotationValue(byte[] buf, int offset,
297297
}
298298
case 'e': {
299299
final Map<String, Object> enumValue =
300-
new TreeMap<String, Object>();
300+
new TreeMap<>();
301301
enumValue.put("enum", raw2className(getStringConstant(getU2(buf,
302302
offset))));
303303
offset += 2;
@@ -309,7 +309,7 @@ private int parseAnnotationValue(byte[] buf, int offset,
309309
case '@': {
310310
// skipping annotation type
311311
offset += 2;
312-
final Map<String, Object> values = new TreeMap<String, Object>();
312+
final Map<String, Object> values = new TreeMap<>();
313313
offset = parseAnnotationValues(buf, offset, values);
314314
value = values;
315315
break;

‎src/main/java/org/scijava/annotations/EclipseHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
public class EclipseHelper extends DirectoryIndexer {
9999

100100
private static final String FORCE_ANNOTATION_INDEX_PROPERTY = "force.annotation.index";
101-
static Set<URL> indexed = new HashSet<URL>();
101+
static Set<URL> indexed = new HashSet<>();
102102
private boolean bannerShown;
103103

104104
private static boolean debug =

‎src/main/java/org/scijava/annotations/Index.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static <A extends Annotation> Index<A> load(final Class<A> annotation,
8686
final ClassLoader loader)
8787
{
8888
EclipseHelper.updateAnnotationIndex(loader);
89-
return new Index<A>(annotation, loader);
89+
return new Index<>(annotation, loader);
9090
}
9191

9292
static final String INDEX_PREFIX = "META-INF/json/";
@@ -110,9 +110,9 @@ private class IndexItemIterator implements Iterator<IndexItem<A>> {
110110
private Map<String, URL> legacyURLs;
111111

112112
public IndexItemIterator(final Class<A> annotation) {
113-
seen = new HashSet<URL>();
113+
seen = new HashSet<>();
114114
try {
115-
legacyURLs = new LinkedHashMap<String, URL>();
115+
legacyURLs = new LinkedHashMap<>();
116116
final Enumeration<URL> legacy =
117117
loader.getResources(LEGACY_INDEX_PREFIX + annotation.getName());
118118
final int legacySuffixLength =
@@ -160,7 +160,7 @@ private void readNext() throws IOException {
160160
@SuppressWarnings("unchecked")
161161
final Map<Object, Object> values =
162162
(Map<Object, Object>) map.get("values");
163-
next = new IndexItem<A>(annotation, loader, className, values);
163+
next = new IndexItem<>(annotation, loader, className, values);
164164
return;
165165
}
166166
indexReader.close();

‎src/main/java/org/scijava/annotations/IndexReader.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public Object next() throws IOException {
8484
return null;
8585
}
8686
if (c == '{') {
87-
Map<String, Object> map = new LinkedHashMap<String, Object>();
87+
Map<String, Object> map = new LinkedHashMap<>();
8888
for (;;) {
8989
if (expect('"', '}') == 1) {
9090
return map;
@@ -99,7 +99,7 @@ public Object next() throws IOException {
9999
}
100100
}
101101
if (c == '[') {
102-
List<Object> list = new ArrayList<Object>();
102+
List<Object> list = new ArrayList<>();
103103
c = in.read();
104104
if (c == ']') {
105105
return list;

‎src/main/java/org/scijava/annotations/legacy/LegacyReader.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public LegacyReader(final InputStream in) throws IOException {
8383
if (version != STREAM_VERSION) {
8484
throw new IOException("Unsupported version: " + version);
8585
}
86-
references = new ArrayList<Object>();
86+
references = new ArrayList<>();
8787
}
8888

8989
public void close() throws IOException {
@@ -260,7 +260,7 @@ protected NonPrimitiveClassDesc(final String className,
260260
if ((fields.length % 2) != 0) {
261261
throw new RuntimeException("That's odd: " + fields.length);
262262
}
263-
this.fields = new LinkedHashMap<String, ClassDesc>();
263+
this.fields = new LinkedHashMap<>();
264264
for (int i = 0; i < fields.length; i += 2) {
265265
String name = (String) fields[i];
266266
ClassDesc classDesc;
@@ -300,7 +300,7 @@ else if (c != TC_OBJECT) {
300300

301301
@Override
302302
protected final Object readWithoutClassDesc() throws IOException {
303-
final Map<String, Object> map = new LinkedHashMap<String, Object>();
303+
final Map<String, Object> map = new LinkedHashMap<>();
304304
int index = references.size();
305305
references.add(map);
306306
for (final String fieldName : order) {
@@ -357,7 +357,7 @@ public static String toSimpleName(Class<?> clazz) {
357357
}
358358

359359
private final Map<String, ClassDesc> classDescs =
360-
new HashMap<String, ClassDesc>();
360+
new HashMap<>();
361361

362362
{
363363
new ClassDesc("B") {
@@ -477,7 +477,7 @@ public Object readExtra(final Map<String, Object> map) throws IOException
477477
expectToken(TC_BLOCKDATA);
478478
expectToken(4);
479479
int capacity = read32();
480-
final List<Object> list = new ArrayList<Object>(capacity);
480+
final List<Object> list = new ArrayList<>(capacity);
481481
for (int i = 0; i < size; i++) {
482482
list.add(readObject());
483483
}

‎src/main/java/org/scijava/app/DefaultAppService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private Map<String, App> apps() {
121121
/** Initializes {@link #apps}. */
122122
private synchronized void initApps() {
123123
if (apps != null) return; // already initialized
124-
final HashMap<String, App> map = new HashMap<String, App>();
124+
final HashMap<String, App> map = new HashMap<>();
125125

126126
for (final App app : getInstances()) {
127127
final String name = app.getInfo().getName();

0 commit comments

Comments
 (0)